* Applied patch from Sven Luther which adds powerpc64 kernels to

the CDs, and adds IBM chrp boot files. Closes: #328274
* Remove Debian_sid task, which dates from before woody and should not be
  used.

debian/changelog

@@ -15,8 +15,12 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
   * Now build etch CDs by default.
   * Remove DH_CODENAME unset from CONF.sh, to allow it to be passed in
     via the environemtn. Closes: #326814
+  * Applied patch from Sven Luther which adds powerpc64 kernels to
+    the CDs, and adds IBM chrp boot files. Closes: #328274
+  * Remove Debian_sid task, which dates from before woody and should not be
+    used.
 
- -- Joey Hess <joeyh@debian.org>  Wed,  7 Sep 2005 15:13:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 14 Sep 2005 11:32:30 -0400
 
 debian-cd (2.2.23) unstable; urgency=low
 

tasks/Debian_sid

@@ -1,20 +0,0 @@
-/*
- * This file is used to build complete set of unstable (sid) CDs
- */
-
-/* The CD set does use empty package called task-*
-   to select the packages in the initial installation */
-
-#if (FORCENONUSONCD1 == 1)
-#include "Debian_sid_nonUS"
-#endif
-
-/* Packages that should really be on CD1 */
-#include <base-woody>
-#include <forcd1>
-
-/* Packages that may still fit on the first CD */
-#include <interesting-fromcd23>
-
-/* All the remaining packages, sorted per popcon results */
-#include <popularity-contest-sarge>

tools/boot/etch/boot-powerpc

@@ -88,7 +88,7 @@ cat $BASEDIR/data/etch/yaboot/yaboot.conf \
  | sed "s/CODENAME/${CODENAME}/g" > yaboot.conf
 cp $BASEDIR/data/etch/yaboot/ofboot.b ofboot.b
 
-for subarch in powerpc power3 power4
+for subarch in powerpc powerpc64
 do
   if [ ! "$DI_WWW_HOME" ];then
         if [ ! "$DI_DIR" ];then 
@@ -105,23 +105,8 @@ do
 	fi
   else
 	wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/"
-	if [ $subarch = powerpc ]; then
-		wget -r -nd --no-parent --level=1 -P "$subarch/2.4" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/2.4/"
-		wget -r -nd --no-parent --level=1 -P "$subarch/minimal" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom-minimal/"
-		wget -r -nd --no-parent --level=1 -P "$subarch/minimal/2.4" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom-minimal/2.4/"
-	else
-		# POWER3 and POWER4 PReP machines do not exist.
-		rm -f "$subarch/vmlinuz-prep.initrd"
-	fi
   fi
 
-  # Save some space with hardlinks; these kernels are identical.
-  if [ -e powerpc/vmlinux ] && [ -e powerpc/minimal/vmlinux ]; then
-	ln -f powerpc/vmlinux powerpc/minimal/vmlinux
-  fi
-  if [ -e powerpc/2.4/vmlinux ] && [ -e powerpc/minimal/2.4/vmlinux ]; then
-	ln -f powerpc/2.4/vmlinux powerpc/minimal/2.4/vmlinux
-  fi
 done
 
 # Copy pegasos forth script, since pegasos machines don't support yaboot yet.
@@ -132,4 +117,12 @@ cat $BASEDIR/data/etch/pegasos/pegasos \
  | sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
  > pegasos
 
+# Let's copy the IBM CHRP stuff into place now.
+cd $CDDIR
+mkdir ppc
+mkdir ppc/chrp
+cp $BASEDIR/data/etch/chrp/bootinfo.txt ppc
+mkdir etc
+cp $INSTALLDIR/yaboot.conf etc
+
 exit 0