[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

FWD: r24093 - in trunk/installer: build/config build/config/hppa build/config/hppa/netboot debian



The patch below is in d-i's trunk, but not sarge branch, and adds 2.6
netboot images for hppa. I have tried both the new 2.6 images and 2.4
images and they work (well, 2.6 installs but fails to boot the installed
system on my a500, unrelated I think). 

I'd like to commit this to the sarge branch, but want to get some review
of it first. Note that it does change the filename of the 2.4 netboot
image on hppa, moving it into a subdirectory. I could skip including
that change, but I don't think anything says the exact directory the
image is in, and so I hope this is a safe change to make.

----- Forwarded message from Joey Hess <joeyh@haydn.debian.org> -----

From: Joey Hess <joeyh@haydn.debian.org>
Date: Wed, 01 Dec 2004 03:45:12 -0700
To: debian-installer_cvs@packages.qa.debian.org
Subject: r24093 - in trunk/installer: build/config build/config/hppa
    build/config/hppa/netboot debian
Reply-To: debian-boot@lists.debian.org

Author: joeyh
Date: Wed Dec  1 03:44:38 2004
New Revision: 24093

Added:
   trunk/installer/build/config/hppa/netboot/2.6.cfg
Modified:
   trunk/installer/build/config/hppa.cfg
   trunk/installer/build/config/hppa/netboot.cfg
   trunk/installer/debian/changelog
Log:
    - Add 2.6 netboot initrds for hppa. Includes a move of the 2.4 netboot
      image into the netboot/ directory for consistency.

Modified: trunk/installer/build/config/hppa.cfg
==============================================================================
--- trunk/installer/build/config/hppa.cfg	(original)
+++ trunk/installer/build/config/hppa.cfg	Wed Dec  1 03:44:38 2004
@@ -14,3 +14,11 @@
    
 arch_boot_screens:
  
+arch_netboot:
+	palo -f /dev/null -k $(TEMP)/vmlinux*32 \
+		-k $(TEMP)/vmlinux*64 \
+		-r $(TEMP_INITRD) -b /usr/share/palo/iplboot \
+		-c "0/linux root=/dev/ram0 initrd=0/ramdisk" \
+		-s $(TEMP_BOOT)
+
+.PHONY: arch_netboot

Modified: trunk/installer/build/config/hppa/netboot.cfg
==============================================================================
--- trunk/installer/build/config/hppa/netboot.cfg	(original)
+++ trunk/installer/build/config/hppa/netboot.cfg	Wed Dec  1 03:44:38 2004
@@ -1,3 +1,5 @@
+FLAVOUR_SUPPORTED = "" 2.6
+
 MEDIA_TYPE = netboot image
 
 TYPE = netboot
@@ -6,13 +8,9 @@
 
 MANIFEST-BOOT = "netboot lifimage for 32-bit and 64-bit HPPA systems"
 
+EXTRANAME = $(MEDIUM)/
+
 .PHONY: arch_boot_screens arch_boot
-arch_boot:
-	palo -f /dev/null -k $(BASE_TMP)netboot/vmlinux*32 \
-		-k $(BASE_TMP)netboot/vmlinux*64 \
-		-r $(TEMP_INITRD) -b /usr/share/palo/iplboot \
-		-c "0/linux root=/dev/ram0 initrd=0/ramdisk" \
-		-s $(TEMP_BOOT)
+arch_boot: arch_netboot
 
 arch_boot_screens:
-

Added: trunk/installer/build/config/hppa/netboot/2.6.cfg
==============================================================================
--- (empty file)
+++ trunk/installer/build/config/hppa/netboot/2.6.cfg	Wed Dec  1 03:44:38 2004
@@ -0,0 +1,7 @@
+KERNELVERSION = $(KERNELVERSION_2.6)
+KERNELIMAGEVERSION = $(KERNELIMAGEVERSION_2.6)
+KERNELMAJOR = 2.6
+EXTRANAME = 2.6/
+
+EXTRATARGETS =
+TARGET = $(BOOT)

Modified: trunk/installer/debian/changelog
==============================================================================
--- trunk/installer/debian/changelog	(original)
+++ trunk/installer/debian/changelog	Wed Dec  1 03:44:38 2004
@@ -4,6 +4,8 @@
     - Add module-init-tools to build deps for ia64 to fix truncated
       modules.dep files and USB keyboard.
     - Add it for sparc too.
+    - Add 2.6 netboot initrds for hppa. Includes a move of the 2.4 netboot
+      image into the netboot/ directory for consistency.
   * Thiemo Seufer
     - Do an e2fsck for the extra floppy images.
     - Handle sparse files in cramfs images more efficiently.


----- End forwarded message -----

-- 
see shy jo

Attachment: signature.asc
Description: Digital signature


Reply to: