- Fix the dirty workaround bug that was adding debs to businesscards.

- Add 2.6 support to powerpc cds.
 - Add yaboot to powerpc netinst cds as debootstrap no longer adds it.
 - Update boot-sparc not to depend on a kernel version.
 - Update debian-installer tasks once again.

Makefile

@@ -345,7 +345,9 @@ $(BDIR)/rawlist:
 # This is just a temporal solution, list2cds should be a little bit less
 # silly so that this is not needed. For more info have a look at
 # http://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html
+ifneq ($(INSTALLER_CD),1)
 	/bin/echo -e "mawk\nexim4-daemon-light\nunifont" >>$(BDIR)/rawlist
+endif
 ifdef FORCENONUSONCD1
 	$(Q)$(apt) cache dumpavail | \
 		grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us)' - | \

data/sarge/yaboot/yaboot.conf

@@ -102,3 +102,99 @@ image=/install/power4/vmlinux
 	initrd-size=8192
 	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
 	read-only
+
+# ... and now massive clone-and-hack for 2.6 ...
+
+# Powerpc subarch 
+image=/install/powerpc/2.6/vmlinux
+	label=install-powerpc-2.6
+	alias=install-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	append="devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+image=/install/powerpc/2.6/vmlinux
+	label=expert-powerpc-2.6
+	alias=expert-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+# some machines have wonky framebuffer support
+image=/install/powerpc/2.6/vmlinux
+	label=install-safe-powerpc-2.6
+	alias=install-safe-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	initrd-size=8192
+	append="devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+image=/install/powerpc/2.6/vmlinux
+	label=expert-safe-powerpc-2.6
+	alias=expert-safe-2.6
+	initrd=/install/powerpc/2.6/initrd.gz
+	initrd-size=8192
+	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+# Power3 subarch
+image=/install/power3/2.6/vmlinux
+	label=install-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	append="devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+image=/install/power3/2.6/vmlinux
+	label=expert-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+# some machines have wonky framebuffer support
+image=/install/power3/2.6/vmlinux
+	label=install-safe-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	initrd-size=8192
+	append="devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+image=/install/power3/2.6/vmlinux
+	label=expert-safe-power3-2.6
+	initrd=/install/power3/2.6/initrd.gz
+	initrd-size=8192
+	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+# Power 4 subarch
+image=/install/power4/2.6/vmlinux
+	label=install-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	append="devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+image=/install/power4/2.6/vmlinux
+	label=expert-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc"
+	initrd-size=8192
+	read-only
+
+# some machines have wonky framebuffer support
+image=/install/power4/2.6/vmlinux
+	label=install-safe-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	initrd-size=8192
+	append="devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only
+
+image=/install/power4/2.6/vmlinux
+	label=expert-safe-power4-2.6
+	initrd=/install/power4/2.6/initrd.gz
+	initrd-size=8192
+	append="DEBCONF_PRIORITY=low devfs=mount,dall video=ofonly init=/linuxrc"
+	read-only

debian/changelog

@@ -72,6 +72,10 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Make fast_sums ignore md5sums of files not in the pool directory.
       Closes: #247889
     - Add support for sarge bootable mipsel cds (delo based), needs work.
+    - Fix the dirty workaround bug that was adding debs to businesscards.
+    - Add 2.6 support to powerpc cds.
+    - Add yaboot to powerpc netinst cds as debootstrap no longer adds it.
+    - Update boot-sparc not to depend on a kernel version.
   * Bdale Garbee
     - shorten the command line in post-boot-hppa for sarge, as palo can't
       handle a command line longer than 127 chars right now

tasks/debian-installer+kernel

@@ -5,13 +5,17 @@
  * This list can be generated with the command:
  * ../tools/generate_di+k_list
  *
- * Last update: Tue Apr 13 14:22:10 MDT 2004
+ * Last update: Sun Jun  6 23:08:15 MDT 2004
  */
 
 #include <debian-installer>
 eject
 locales
 lvm10
+libdevmapper1.00
+lvm-common
+lvm2
+mdadm
 aptitude
 jfbterm
 unifont
@@ -22,14 +26,16 @@ console-terminus
 pcmcia-cs
 wireless-tools
 xfsprogs
+jfsutils
 reiserfsprogs
 #ifdef ARCH_i386
 discover
 discover1
 grub
 lilo
-kernel-image-2.4.25-1-386
-kernel-pcmcia-modules-2.4.25-1-386
+kernel-image-2.4.26-1-386
+kernel-pcmcia-modules-2.4.26-1-386
+kernel-image-2.6.6-1-386
 #endif
 #ifdef ARCH_alpha
 discover1
@@ -37,37 +43,43 @@ kernel-image-2.4-generic
 kernel-image-2.4-smp
 kernel-image-2.4.25-1-generic
 kernel-image-2.4.25-1-smp
+kernel-image-2.4.26-1-generic
+kernel-image-2.4.26-1-smp
 kernel-image-2.6-generic
 kernel-image-2.6-smp
-kernel-image-2.6.3-1-generic
-kernel-image-2.6.3-1-smp
+kernel-image-2.6.5-1-generic
+kernel-image-2.6.5-1-smp
+kernel-image-2.6.6-1-generic
+kernel-image-2.6.6-1-smp
+kernel-image-netbootable
 #endif
 #ifdef ARCH_hppa
 discover1
-kernel-image-2.4.25-32
-kernel-image-2.4.25-32-smp
-kernel-image-2.4.25-64
-kernel-image-2.4.25-64-smp
+kernel-image-2.4.26-32-smp
+kernel-image-2.4.26-64
+kernel-image-2.4.26-64-smp
+kernel-image-netbootable
 #endif
 #ifdef ARCH_ia64
 discover1
 initrd-tools
-kernel-image-2.6.3-itanium
-kernel-image-2.6.3-itanium-smp
-kernel-image-2.6.3-mckinley
-kernel-image-2.6.3-mckinley-smp
+kernel-image-2.4.25-itanium
+kernel-image-2.4.25-itanium-smp
+kernel-image-2.4.25-mckinley
+kernel-image-2.4.25-mckinley-smp
 #endif
 #ifdef ARCH_mips
 arcboot
-kernel-image-2.4.22-r4k-ip22
-kernel-image-2.4.22-r5k-ip22
+kernel-image-2.4.26-r4k-ip22
+kernel-image-2.4.26-r5k-ip22
 #endif
 #ifdef ARCH_mipsel
-kernel-image-2.4.19-r3k-kn02
-kernel-image-2.4.19-r4k-kn04
+kernel-image-2.4.26-r3k-kn02
+kernel-image-2.4.26-r4k-kn04
 #endif
 #ifdef ARCH_powerpc
 discover1
+yaboot
 kernel-image-2.4.25-powerpc-pmac
 kernel-image-2.4.25-powerpc-small-pmac
 kernel-image-2.4.25-powerpc-prep
@@ -77,17 +89,17 @@ kernel-image-2.4.25-apus
 #endif
 #ifdef ARCH_sparc
 discover1
-kernel-image-2.4.24-sparc32
-kernel-image-2.4.24-sparc32-smp
-kernel-image-2.4.24-sparc64
-kernel-image-2.4.24-sparc64-smp
+initrd-tools
+kernel-image-2.4.26-sparc32
+kernel-image-2.4.26-sparc32-smp
+kernel-image-2.4.26-sparc64
+kernel-image-2.4.26-sparc64-smp
 #endif
 #ifdef ARCH_m68k
-kernel-image-2.2.25-amiga
-kernel-image-2.2.25-atari
-kernel-image-2.2.25-bvme6000
 kernel-image-2.2.25-mac
-kernel-image-2.2.25-mvme147
-kernel-image-2.2.25-mvme16x
-kernel-image-2.4.25-amiga
+kernel-image-2.4.26-amiga
+kernel-image-2.4.26-atari
+kernel-image-2.4.26-bvme6000
+kernel-image-2.4.26-mvme147
+kernel-image-2.4.26-mvme16x
 #endif

tools/boot/sarge/boot-powerpc

@@ -67,16 +67,15 @@ cp $BASEDIR/data/sarge/yaboot/ofboot.b ofboot.b
 
 for subarch in powerpc power3 power4
 do
-  mkdir $subarch
   if [ ! "$DI_WWW_HOME" ];then
 	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom"
   else
 	DI_DIR="di_stuff"
-	mkdir "$DI_DIR"
-	wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME/$subarch/cdrom/"
+	wget -r -nd --no-parent --level=1 -P "$DI_DIR" "$DI_WWW_HOME/$subarch/cdrom/"
+	wget -r -nd --no-parent --level=1 -P "$DI_DIR/2.6" "$DI_WWW_HOME/$subarch/cdrom/2.6/"
+	rm -f "$DI_DIR"/index* "$DI_DIR/2.6"/index*
   fi
-  cp "$DI_DIR"/vmlinu* "$subarch"
-  cp "$DI_DIR"/initrd.gz "$subarch"
+  cp -a "$DI_DIR" "$subarch"
   rm -rf di_stuff
 done
 

tools/boot/sarge/boot-sparc

@@ -52,12 +52,16 @@ cat $BASEDIR/data/sarge/sparc/debian.txt \
 # uncompress it before hand.
 
 if [ ! "$DI_WWW_HOME" ];then
-	cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/initrd.gz" "$inst/boot/initrd.gz"
-	cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/vmlinuz-2.4.24-sparc32" "$inst/boot/sparc32"
-	zcat "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/vmlinuz-2.4.24-sparc64" > "$inst/boot/sparc64"
+	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
 else
-	wget "$DI_WWW_HOME/initrd.gz" -O "$inst/boot/initrd.gz"
-	wget "$DI_WWW_HOME/vmlinuz-2.4.24-sparc32" -O "$inst/boot/sparc32"
-	wget "$DI_WWW_HOME/vmlinuz-2.4.24-sparc64"
-	zcat vmlinuz-2.4.24-sparc64 > "$inst/boot/sparc64"
+	DI_DIR="."
+	wget "$DI_WWW_HOME" -O di.dir
+	sparc32=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc32\)".*/\1/p' di.dir)
+	sparc64=$(sed -n 's/.*a href="\(vmlinuz-.*-sparc64\)".*/\1/p' di.dir)
+	wget "$DI_WWW_HOME/$sparc32" -O vmlinuz-x-sparc32
+	wget "$DI_WWW_HOME/$sparc64" -O vmlinuz-x-sparc64
+	wget "$DI_WWW_HOME/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"

tools/generate_di+k_list

@@ -115,6 +115,7 @@ cat >> debian-installer+kernel << EOF
 #endif
 #ifdef ARCH_powerpc
 discover1
+yaboot
 EOF
 
 # Only include powerpc kernels that d-i base-installer installs.