Update boot script for powerpc in sarge to sync with the others, I have

added a new ofboot.b as the changes needed for sarge didn't seem to be
suited for woody.

data/sarge/yaboot/ofboot.b

@@ -0,0 +1,64 @@
+<CHRP-BOOT>
+<COMPATIBLE>
+MacRISC MacRISC3 MacRISC4
+</COMPATIBLE>
+<DESCRIPTION>
+GNU/Linux PPC bootloader
+</DESCRIPTION>
+<BOOT-SCRIPT>
+" screen" output
+load-base release-load-area
+boot cd:,\install\yaboot
+</BOOT-SCRIPT>
+<OS-BADGE-ICONS>
+1010
+000000000000F8FEACF6000000000000
+0000000000F5FFFFFEFEF50000000000
+00000000002BFAFEFAFCF70000000000
+0000000000F65D5857812B0000000000
+0000000000F5350B2F88560000000000
+0000000000F6335708F8FE0000000000
+00000000005600F600F5FD8100000000
+00000000F9F8000000F5FAFFF8000000
+000000008100F5F50000F6FEFE000000
+000000F8F700F500F50000FCFFF70000
+00000088F70000F50000F5FCFF2B0000
+0000002F582A00F5000008ADE02C0000
+00090B0A35A62B0000002D3B350A0000
+000A0A0B0B3BF60000505E0B0A0B0A00
+002E350B0B2F87FAFCF45F0B2E090000
+00000007335FF82BF72B575907000000
+000000000000ACFFFF81000000000000
+000000000081FFFFFFFF810000000000
+0000000000FBFFFFFFFFAC0000000000
+000000000081DFDFDFFFFB0000000000
+000000000081DD5F83FFFD0000000000
+000000000081DDDF5EACFF0000000000
+0000000000FDF981F981FFFF00000000
+00000000FFACF9F9F981FFFFAC000000
+00000000FFF98181F9F981FFFF000000
+000000ACACF981F981F9F9FFFFAC0000
+000000FFACF9F981F9F981FFFFFB0000
+00000083DFFBF981F9F95EFFFFFC0000
+005F5F5FDDFFFBF9F9F983DDDD5F0000
+005F5F5F5FDD81F9F9E7DF5F5F5F5F00
+0083DD5F5F83FFFFFFFFDF5F835F0000
+000000FBDDDFACFBACFBDFDFFB000000
+000000000000FFFFFFFF000000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFF0000000000
+0000000000FFFFFFFFFFFFFF00000000
+00000000FFFFFFFFFFFFFFFFFF000000
+00000000FFFFFFFFFFFFFFFFFF000000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFFFF0000
+00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
+00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00
+00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
+000000FFFFFFFFFFFFFFFFFFFF000000
+</OS-BADGE-ICONS>
+</CHRP-BOOT>

tools/boot/sarge/boot-powerpc

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Do install stuff for i386, including making bootable CDs
+# Do install stuff for powerpc, including making bootable CDs
 # Works with debian-installer
 #
 # $1 is the CD number
@@ -13,8 +13,11 @@ set -e
 N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
-if [ ! "$WWW_HOME" ];then
-   WWW_HOME="http://people.debian.org/~tsauter/d-i/images-powerpc/daily"
+if [ "$DI_WWW_HOME" = "default" ];then
+   DI_WWW_HOME="http://people.debian.org/~luther/debian-installer/daily-powerpc-built/current"
+fi
+if [ ! "$DI_DIST" ]; then
+   DI_DIST="$DI_CODENAME"
 fi
 
 cd $CDDIR/..
@@ -33,29 +36,25 @@ echo -n "--netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \
 # We are still missing this for prep
 #echo -n " -prep-boot install/prep/boot.bin" >> $N.mkisofs_opts
 # For newworld Mac booting  - Note, no spaces in volid!
-echo -n " -part -no-desktop -hfs-bless CD$N/install/powermac -hfs-volid Debian/PowerPC_${CODENAME}" \
+echo -n " -part -no-desktop -hfs-bless CD$N/install -hfs-volid Debian/PowerPC_${CODENAME}" \
 	>> $N.mkisofs_opts
 
 cd $INSTALLDIR
-# create directories for different sub-archs
-mkdir {apus,chrp,powermac,prep}
-
 # Extract yaboot from the archive
 if [ -z "$YABOOT_DEBUG" ]; then
     YADEB="$($BASEDIR/tools/apt-selection cache show yaboot | \
 	   grep ^Filename | awk '{print $2}')"
     (ar p "${MIRROR}/${YADEB}" data.tar.gz | \
-	tar zxf - -C powermac ./usr/lib/yaboot/yaboot)
-    mv powermac/usr/lib/yaboot/yaboot powermac/yaboot
-    rm -rf powermac/usr
+	tar zxf - -C . ./usr/lib/yaboot/yaboot)
+    mv usr/lib/yaboot/yaboot .
+    rm -rf usr
 else
- cp -f $YABOOT_DEBUG powermac/yaboot
+ cp -f $YABOOT_DEBUG yaboot
 fi
 
 #
-# generate/download images for "powermac"
+# generate/download images for "powerpc"
 # (missing: bootvars1.3b.sit.hqx, BootX_1.2.2.sit, boot-floppy-hfs.img)
-cd $INSTALLDIR/powermac
 BUILD_DATE=$(date +%Y%m%d)
 cat $BASEDIR/data/sarge/yaboot/boot.msg \
  | sed "s/\${MEDIA_TYPE}/CDROM/" \
@@ -64,27 +63,21 @@ cat $BASEDIR/data/sarge/yaboot/boot.msg \
  > boot.msg
 cat $BASEDIR/data/sarge/yaboot/yaboot.conf \
  | sed "s/CODENAME/${CODENAME}/g" > yaboot.conf
-cp $BASEDIR/data/yaboot/ofboot.b ofboot.b
-wget -O vmlinux $WWW_HOME/vmlinux
-wget -O root.bin $WWW_HOME/cdrom-initrd.gz
-
-#
-# generate/download images for "apus"
-# (missing: linux.bin)
-cd $INSTALLDIR/apus
-cp -lf ../powermac/root.bin .
-
-#
-# generate/download images for "chrp"
-# (missing: linux.bin)
-cd $INSTALLDIR/chrp
-cp -lf ../powermac/root.bin .
-
-#
-# generate/download images for "prep"
-# (missing: linux.bin, boot.bin)
-cd $INSTALLDIR/prep
-cp -lf ../powermac/root.bin .
+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/"
+  fi
+  cp "$DI_DIR"/vmlinu* "$subarch"
+  cp "$DI_DIR"/initrd.gz "$subarch"
+  rm -rf di_stuff
+done
 
 exit 0