Martin, Thiemo, Please check if the boot configuration files for mips/mipsel are still generated correctly after the modifications in this commit (when you get builds going again for mips/mipsel!). With the kernel version updates today I noticed that some of the files were incorrect (still at 2.6.18-4), and I was getting somewhat tired of having to remember that these files needed to be updated separately. The only change I have some doubts about is the config script for Cobalt netboot (see below). This had 'install -m 644' and the file is now basically just catted into location. I don't think it makes a difference, but please check. Note that some files for other arches were changed as well because of a script rename. You can ignore those. Cheers, FJP ---------- Forwarded Message ---------- Subject: r47976 - in trunk/installer: build/boot/mips build/boot/mipsel build/config build/config/mips/sb1-bcm91250a build/config/mips/sb1a-bcm91480b build/config/mipsel/cobalt/netboot-2.6 build/config/sparc/combined build/config/sparc/sparc32 build/util debian Date: Saturday 07 July 2007 02:03 From: Frans Pop <fjp@alioth.debian.org> To: debian-installer_cvs@packages.qa.debian.org Author: fjp Date: Sat Jul 7 00:02:59 2007 New Revision: 47976 Log: * Get rid of hardcoded kernel versions in boot configuration files for mips and mipsel; rename bootscreen-subst to bootvars-subst to reflect this somewhat more general use of this script. * Untested; needs testing by mips/mipsel porters! Added: trunk/installer/build/util/bootvars-subst - copied, changed from r47971, /trunk/installer/build/util/bootscreen-subst Removed: trunk/installer/build/util/bootscreen-subst Modified: trunk/installer/build/boot/mips/sb1a-bcm91480b.conf-2.6 trunk/installer/build/boot/mips/sibyl.conf-2.6 trunk/installer/build/boot/mipsel/colo.nfs-2.6 trunk/installer/build/config/ia64.cfg trunk/installer/build/config/mips/sb1-bcm91250a/netboot-2.6.cfg trunk/installer/build/config/mips/sb1a-bcm91480b/netboot-2.6.cfg trunk/installer/build/config/mipsel/cobalt/netboot-2.6/common.cfg trunk/installer/build/config/powerpc.cfg trunk/installer/build/config/sparc/combined/miniiso-2.6.cfg trunk/installer/build/config/sparc/sparc32/floppy-2.6.cfg trunk/installer/build/config/x86.cfg trunk/installer/debian/changelog [Most changes removed] Modified: trunk/installer/build/config/mipsel/cobalt/netboot-2.6/common.cfg ======================================================================== @@ -20,7 +20,7 @@ # CoLo configuration file for NFS $(SOME_DEST)/default.colo: - install -m 644 boot/mipsel/colo.nfs-2.6 $@ + bootvars-subst KERNELVERSION KERNELVERSION_2.6 <boot/mipsel/colo.nfs-2.6 >$@ update-manifest $@ "Cobalt NFS boot configuration script" # Create a nfsroot tar file which can easily be extracted (containing all -------------------------------------------------------
Attachment:
pgpRrKdH5uUga.pgp
Description: PGP signature