[RFR] Patches switching sparc64 to 2.6.12

To: debian-boot@lists.debian.org
Cc: stappers@stappers.nl
Subject: [RFR] Patches switching sparc64 to 2.6.12
From: Frans Pop <aragorn@tiscali.nl>
Date: Wed, 24 Aug 2005 23:40:19 +0200
Message-id: <[🔎] 200508242340.27819.aragorn@tiscali.nl>

Attached are three sparate patches that together:
- switch 2.6 kernel for sparc64 from 2.6.8 to 2.6.12
- drop 2.6 support for sparc32 as there is no 2.6.12 kernel available
- add 2.6 mini.iso for sparc64
- make multiboot CD-ROMs supporting
  - 2.6.12 (default) and 2.4.27 for sparc64
  - 2.4.27 for sparc32
- implement rescue mode (from Colin) instead of rescue boot (/bin/sh)

Question:
- should we also switch to "install" instead of "linux" for sparc?

Open issue (not blocking):
- see http://bugs.debian.org/324675

I'd appreciate a review (Joey!) before I start implementing these changes. 
I will coordinate the implementation with Geert.

Cheers,
FJP

Index: installer/build/boot/sparc/silo-2.6.conf
===================================================================
--- installer/build/boot/sparc/silo-2.6.conf	(revision 0)
+++ installer/build/boot/sparc/silo-2.6.conf	(revision 0)
@@ -0,0 +1,23 @@
+partition=1
+timeout=600
+read-only
+message=/boot/debian.txt
+default=linux
+initrd=/boot/initrd.gz
+root=/dev/rd/0
+read-write
+
+# Standard boot images
+image[sun4u]=/boot/vmlinuz-sparc64
+  append="ramdisk_size=9000 rootfstype=ext2"
+  label=linux
+
+# Expert boots
+image[sun4u]=/boot/vmlinuz-sparc64
+  append="DEBCONF_PRIORITY=low ramdisk_size=9000 rootfstype=ext2"
+  label=expert
+
+# Rescue boots
+image[sun4u]=/boot/vmlinuz-sparc64
+  append="rescue/enable=true ramdisk_size=9000 rootfstype=ext2"
+  label=rescue
Index: installer/build/config/sparc.cfg
===================================================================
--- installer/build/config/sparc.cfg	(revision 30148)
+++ installer/build/config/sparc.cfg	(working copy)
@@ -5,9 +5,12 @@
 
 KERNELMAJOR = 2.4
 BASEVERSION = 2.4.27-2
-BASEVERSION_2.6 = 2.6.8-2
+BASEVERSION_2.6 = 2.6.12-1
 KERNELIMAGEVERSION = $(BASEVERSION)-sparc32 $(BASEVERSION)-sparc64
-KERNELIMAGEVERSION_2.6 = $(BASEVERSION_2.6)-sparc32 $(BASEVERSION_2.6)-sparc64
+# no 2.6.12 kernel available for sparc32
+#KERNELIMAGEVERSION_2.6 = $(BASEVERSION_2.6)-sparc32 $(BASEVERSION_2.6)-sparc64
+KERNELIMAGEVERSION_2.6 = $(BASEVERSION_2.6)-sparc64
+
 KERNEL_FLAVOUR = di
 KERNELVERSION = $(foreach ver,${KERNELIMAGEVERSION},$(ver))
 KERNELVERSION_2.6 = $(foreach ver,${KERNELIMAGEVERSION_2.6},$(ver))
Index: installer/build/config/sparc/combined/cdrom.cfg
===================================================================
--- installer/build/config/sparc/combined/cdrom.cfg	(revision 30148)
+++ installer/build/config/sparc/combined/cdrom.cfg	(working copy)
@@ -1,6 +1,4 @@
-# 2.6 now builds correctly if line below uncommented
-# TODO: silo configuration and debian-cd adaptations
-#FLAVOUR_SUPPORTED = "" 2.6
+FLAVOUR_SUPPORTED = "" 2.6
 
 MEDIA_TYPE = CD-ROM
 
Index: installer/build/config/sparc/combined/miniiso-2.6.cfg
===================================================================
--- installer/build/config/sparc/combined/miniiso-2.6.cfg	(revision 30148)
+++ installer/build/config/sparc/combined/miniiso-2.6.cfg	(working copy)
@@ -17,11 +17,13 @@
 arch_miniiso:
 	-rm -rf $(TEMP_CD_TREE)/*
 	install -m 644 -D $(TEMP)/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
-	install -m 644 -D $(TEMP)/vmlinuz*32 $(TEMP_CD_TREE)/boot/vmlinuz-sparc32
+	# no 2.6.12 kernel available for sparc32
+	#install -m 644 -D $(TEMP)/vmlinuz*32 $(TEMP_CD_TREE)/boot/vmlinuz-sparc32
 	install -m 644 -D $(TEMP)/vmlinuz*64 $(TEMP_CD_TREE)/boot/vmlinuz-sparc64
 	install -m 644 /boot/second.b $(TEMP_CD_TREE)/boot
 	install -m 644 $(TEMP_BOOT_SCREENS)/debian.txt $(TEMP_CD_TREE)/boot
-	install -m 644 boot/sparc/silo.conf $(TEMP_CD_TREE)/boot
+	# need a different silo.conf as there is no sparc32 support
+	install -m 644 boot/sparc/silo-2.6.conf $(TEMP_CD_TREE)/boot/silo.conf
  
 	mkisofs -r -J -o $(TEMP_MINIISO) -G /boot/isofs.b -B ... $(TEMP_CD_TREE)
 
Index: installer/build/config/sparc/sparc32.cfg
===================================================================
--- installer/build/config/sparc/sparc32.cfg	(revision 30148)
+++ installer/build/config/sparc/sparc32.cfg	(working copy)
@@ -1,5 +1,6 @@
 # floppies need root to build, so don't autobuild
-MEDIUM_SUPPORTED = netboot netboot-2.6 #floppy floppy-2.6
+# no 2.6.12 kernel available for sparc32, so disable netboot-2.6
+MEDIUM_SUPPORTED = netboot #netboot-2.6 floppy floppy-2.6
  
 # The version of the kernel to use.
 KERNELIMAGEVERSION = $(BASEVERSION)-sparc32

Index: tools/boot/etch/boot-sparc
===================================================================
--- tools/boot/etch/boot-sparc	(revision 898)
+++ tools/boot/etch/boot-sparc	(working copy)
@@ -36,7 +36,7 @@
 inst=boot1
 
 # Setup directories
-mkdir -p $inst/boot
+mkdir -p $inst/boot/2.6
 
 silo_deb=`ls $MIRROR/pool/main/s/silo/silo_*.deb | tail -1`
 # put the relevant parts of SILO boot loader
@@ -67,7 +67,18 @@
 	wget "$DI_WWW_HOME/$sparc32" -O vmlinuz-x-sparc32
 	wget "$DI_WWW_HOME/$sparc64" -O vmlinuz-x-sparc64
 	wget "$DI_WWW_HOME/initrd.gz"
+
+	mkdir ./2.6
+	DI_WWW_HOME=$DI_WWW_HOME/2.6
+	wget "$DI_WWW_HOME" -O ./2.6/di.dir
+	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' ./2.6/di.dir)
+	wget "$DI_WWW_HOME/$sparc64" -O ./2.6/vmlinuz-x-sparc64
+	wget "$DI_WWW_HOME/initrd.gz" -O ./2.6/initrd.gz
 fi
+
 cp "$DI_DIR"/initrd.gz "$inst/boot/initrd.gz"
 cp "$DI_DIR"/vmlinuz-*-sparc32 "$inst/boot/sparc32"
 zcat "$DI_DIR"/vmlinuz-*-sparc64 > "$inst/boot/sparc64"
+
+cp "$DI_DIR"/2.6/initrd.gz "$inst/boot/2.6/initrd.gz"
+zcat "$DI_DIR"/2.6/vmlinuz-*-sparc64 > "$inst/boot/2.6/sparc64"
Index: data/etch/sparc/silo.conf
===================================================================
--- data/etch/sparc/silo.conf	(revision 898)
+++ data/etch/sparc/silo.conf	(working copy)
@@ -2,20 +2,34 @@
 timeout=600
 message=/boot/debian.txt
 default=linux
-append="cdrom ramdisk_size=16384 devfs=mount rw"
-initrd=/boot/initrd.gz
+append="cdrom ramdisk_size=18000 devfs=mount rw"
 root=/dev/rd/0
 
-# Standard boot images
-image[sun4c,sun4d,sun4m]=/boot/sparc32
+### sparc64 boot images
+image[sun4u]=/boot/2.6/sparc64
    label=linux
+   initrd=/boot/2.6/initrd.gz
 image[sun4u]=/boot/sparc64
+   label=linux24
+   initrd=/boot/initrd.gz
+
+# sparc64 rescue boots
+image[sun4u]=/boot/2.6/sparc64
+   label=rescue
+   initrd=/boot/2.6/initrd.gz
+   append="rescue/enable=true"
+image[sun4u]=/boot/sparc64
+   label=rescue24
+   initrd=/boot/initrd.gz
+   append="rescue/enable=true"
+
+### sparc32 boot images
+image[sun4c,sun4d,sun4m]=/boot/sparc32
    label=linux
+   initrd=/boot/initrd.gz
 
-# Rescue boots
+# sparc32 rescue boots
 image[sun4c,sun4d,sun4m]=/boot/sparc32
-  label=rescue
-  append="init=/bin/sh"
-image[sun4u]=/boot/sparc64
-  label=rescue
-  append="init=/bin/sh"
+   label=rescue
+   initrd=/boot/initrd.gz
+   append="rescue/enable=true"

Index: packages/kernel/linux-kernel-di-sparc-2.6/debian/changelog
===================================================================
--- packages/kernel/linux-kernel-di-sparc-2.6/debian/changelog	(revision 30080)
+++ packages/kernel/linux-kernel-di-sparc-2.6/debian/changelog	(working copy)
@@ -1,10 +1,17 @@
 linux-kernel-di-sparc-2.6 (0.06) UNRELEASED; urgency=low
 
+  [ Joey Hess ]
   * Update to kernel-wedge 2.0.
   * Use common usb-modules list.
 
- -- Joey Hess <joeyh@debian.org>  Sun,  7 Aug 2005 22:43:52 -0400
+  [ Frans Pop ]
+  * Build against linux-image-2.6.12-1.
+  * Dropped support for sparc32 as it has no 2.6.12 kernel support.
+  * Remove module qlogicisp for sparc64 as it no longer exists in 2.6.12.
+  * Add isofs to ide-modules.
 
+ -- Frans Pop <fjp@debian.org>  Tue, 23 Aug 2005 22:54:40 +0200
+
 linux-kernel-di-sparc-2.6 (0.05) unstable; urgency=low
 
   * Build against kernel-image-2.6.8-2-*.
Index: packages/kernel/linux-kernel-di-sparc-2.6/kernel-versions
===================================================================
--- packages/kernel/linux-kernel-di-sparc-2.6/kernel-versions	(revision 30080)
+++ packages/kernel/linux-kernel-di-sparc-2.6/kernel-versions	(working copy)
@@ -1,3 +1,3 @@
 # arch   version  flavour       installedname        suffix build-depends
-sparc    2.6.8-2  sparc64       2.6.8-2-sparc64      y      kernel-image-2.6.8-2-sparc64
-sparc    2.6.8-2  sparc32       2.6.8-2-sparc32      y      kernel-image-2.6.8-2-sparc32
+sparc    2.6.12-1 sparc64       2.6.12-1-sparc64     y      linux-image-2.6.12-1-sparc64
+#sparc   2.6.8-2  sparc32       2.6.8-2-sparc32      y      kernel-image-2.6.8-2-sparc32
Index: packages/kernel/linux-kernel-di-sparc-2.6/modules/sparc64/scsi-common-modules
===================================================================
--- packages/kernel/linux-kernel-di-sparc-2.6/modules/sparc64/scsi-common-modules	(revision 30080)
+++ packages/kernel/linux-kernel-di-sparc-2.6/modules/sparc64/scsi-common-modules	(working copy)
@@ -1,6 +1,5 @@
 scsi_transport_spi
 esp
-qlogicisp
 aic79xx
 qlogicfc
 sym53c8xx
Index: packages/kernel/linux-kernel-di-sparc-2.6/modules/sparc64/ide-modules
===================================================================
--- packages/kernel/linux-kernel-di-sparc-2.6/modules/sparc64/ide-modules	(revision 30080)
+++ packages/kernel/linux-kernel-di-sparc-2.6/modules/sparc64/ide-modules	(working copy)
@@ -12,3 +12,4 @@
 siimage
 ide-disk
 ide-generic
+isofs

Attachment: pgpG23qLIe9dU.pgp
Description: PGP signature

Reply to:

Follow-Ups:
- Re: [RFR] Patches switching sparc64 to 2.6.12
  - From: Joey Hess <joeyh@debian.org>
- Re: [RFR] Patches switching sparc64 to 2.6.12
  - From: stappers@stappers.nl (Geert Stappers)

Prev by Date: [D-I Manual] Build log for en (24 Aug 2005)
Next by Date: Processed: Mailaddress Housekeeping
Previous by thread: [D-I Manual] Build log for en (24 Aug 2005)
Next by thread: Re: [RFR] Patches switching sparc64 to 2.6.12
Index(es):
- Date
- Thread