merge recent changes from cvs head to debian-edu branch

data/sarge/exclude-udebs-i386

@@ -1,8 +1,6 @@
-# These udebs build the d-i cdrom initrd. As such, there is no reason
-# to keep another copy of them on the CD in udeb form.
-#
-# This duplicates data found in the file build/pkg-lists/cdrom/i386,
-# in d-i cvs.
+# These udebs are in the d-i cdrom initrd and the hd-media initrd. 
+# As such, there is no reason to keep another copy of them on the CD
+# in udeb form.
 isa-pnp-modules-*
 socket-modules-*
 console-keymaps-at
@@ -11,7 +9,6 @@ discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-floppy-modules-*
 fat-modules-*
 cdrom-core-modules-*
 cdrom-modules-*
@@ -21,7 +18,6 @@ input-modules-*
 fb-modules-*
 kbd-chooser
 usb-modules-*
-firewire-core-modules-*
 usb-storage-modules-*
 scsi-core-modules-*
 # Not needed with the 2.4 kernel on i386.

debian/changelog

@@ -27,6 +27,14 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
       of hw-detect.
     - Add tools/get_diskusage.pl (originally by Petter).
     - Add update-popcon Makefile target (taken from Skolelinux).
+    - Add a KERNEL_PARAMS variable, which can be used to add kernel parameters
+      and is useful for creating things like CDs that install in critical
+      priority mode. I only implemented it for i386 so far.
+    - Add MAXCDS config variable, which forces debian-cd to stop after a given
+      number of binary CDs.
+    - Only exclude udebs from the CD that are in both the cd initrd and the
+      hd-media initrd, since both use the CD. This adds back floppy-modules
+      and firewire-core-modules.
   * Petter Reinholdtsen
     - Regenereated tasks/popularity-contest-sarge based on the current data.
     - Avoid kernel versions 2.4.24 and 2.6.3 on the first i386 CD, as we
@@ -98,6 +106,7 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
   * Colin Watson
     - Add exclude-udebs-powerpc list with packages already in the initrd,
       along the same lines as exclude-udebs-i386. Saves about 11 megabytes.
+    - Add bootable CD support for arm, following Vince Sanders' advice.
 
  -- Raphael Hertzog <hertzog@debian.org>  Thu, 25 Mar 2004 07:33:23 +0100
 

tools/boot/sarge/boot-arm

@@ -1,14 +1,51 @@
 #!/bin/sh
+#
+# Do install stuff for arm, including making bootable CDs
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
+#
+# According to Vince Sanders, most subarchitectures (with the notable
+# exception of real netwinders; note that 'netwinder' actually supports
+# other machines too) have CD-ROM drives, and can boot from them given a
+# kernel and an initrd. The bootloader is in NOR flash memory.
 
-# Nothing has to be done since the supported ARM computers are computers
-# without CDROM and so they don't need to be able to boot from CD ...
-#
-# The CDs may only be useful to provide the packages via the network.
-#
-# This file must however exist so that debian-cd doesn't complain about
-# lack of "bootable" support.
-#
-# -- Raphaël Hertzog
+. $BASEDIR/tools/boot/$CODENAME/common.sh
+
+set -e
+
+N=$1
+CDDIR=$2
+INSTALLDIR=$CDDIR/install
+if [ "$DI_WWW_HOME" = "default" ];then
+   DI_WWW_HOME="http://people.debian.org/~vince/d-i/images/daily"
+fi
+if [ ! "$DI_DIST" ]; then
+   DI_DIST="$DI_CODENAME"
+fi
+
+cd $CDDIR/..
+
+echo -J > $N.mkisofs_opts
+
+# Only disk 1* bootable
+if [ $N != 1 ] && [ $N != 1_NONUS ]; then
+	exit 0
+fi
+
+cd $INSTALLDIR
+
+for subarch in bast netwinder riscpc riscstation; do
+	if [ ! "$DI_WWW_HOME" ];then
+		DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom"
+	else
+		DI_DIR="di_stuff"
+		wget -r -nd --no-parent --level=1 -P "$DI_DIR" "$DI_WWW_HOME/$subarch/cdrom/"
+		rm -f "$DI_DIR"/index*
+	fi
+	cp -a "$DI_DIR" "$subarch"
+	rm -rf di_stuff
+done
 
 exit 0
-