On Wed, Aug 24, 2005 at 11:40:19PM +0200, Frans Pop wrote: > 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) > <snip/> > > I'd appreciate a review (Joey!) before I start implementing these changes. > I will coordinate the implementation with Geert. I'm looking forward to the proposal > > Cheers, > FJP > > --- installer/build/boot/sparc/silo-2.6.conf (revision 0) > +++ installer/build/boot/sparc/silo-2.6.conf (revision 0) > =================================================================== > --- installer/build/config/sparc.cfg (revision 30148) > +++ installer/build/config/sparc.cfg (working copy) > =================================================================== > --- installer/build/config/sparc/combined/cdrom.cfg (revision 30148) > +++ installer/build/config/sparc/combined/cdrom.cfg (working copy) > =================================================================== > --- installer/build/config/sparc/combined/miniiso-2.6.cfg (revision 30148) > +++ installer/build/config/sparc/combined/miniiso-2.6.cfg (working copy) > =================================================================== > --- 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 Fine for in "trunk" +MEDIUM_SUPPORTED = netboot floppy #netboot-2.6 floppy-2.6 is possible on buildsystem that may/can create floppy images > > # The version of the kernel to use. > KERNELIMAGEVERSION = $(BASEVERSION)-sparc32 > =================================================================== > --- tools/boot/etch/boot-sparc (revision 898) > +++ tools/boot/etch/boot-sparc (working copy) > =================================================================== > --- 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" I would expect 17408 or 18432, because they are Mib boundaries > =================================================================== > --- 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-*. > =================================================================== > --- packages/kernel/linux-kernel-di-sparc-2.6/kernel-versions (revision 30080) > +++ packages/kernel/linux-kernel-di-sparc-2.6/kernel-versions (working copy) > =================================================================== > --- 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 I assume it is a cleanup that has nothing to do with the 2.6.12 switch. > 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 "isofs" doesn't look very "ide-modules" Shouldn't 'isofs' go into another "...-modules" file? Cheers Geert Stappers
Attachment:
signature.asc
Description: Digital signature