From c924cdc420f64e561b67dadb7fadd148fbda603f Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Mon, 12 Jul 2004 22:26:43 +0000
Subject: [PATCH] First checkin of JTE changes.

The JTE patch includes direct support for making CDs bootable on
alpha, hppa, mips and mipsel. Specify the options necessary for
mkisofs to use that support.
---
 tools/boot/sarge/boot-alpha  | 2 +-
 tools/boot/sarge/boot-hppa   | 8 ++++++++
 tools/boot/sarge/boot-mips   | 5 ++++-
 tools/boot/sarge/boot-mipsel | 4 +++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tools/boot/sarge/boot-alpha b/tools/boot/sarge/boot-alpha
index 4111a88d..2286e878 100755
--- a/tools/boot/sarge/boot-alpha
+++ b/tools/boot/sarge/boot-alpha
@@ -88,7 +88,7 @@ EOF
     #cp -lf floppy-initrd.gz $CDDIR/install
 
     # write final lines to mkisofs_opts
-    echo -n "boot$N " >> $N.mkisofs_opts
+    echo -n "-alpha-boot boot/bootlx boot$N " >> $N.mkisofs_opts
 
 else
     echo -n "-cache-inodes -J -l "  > $N.mkisofs_opts
diff --git a/tools/boot/sarge/boot-hppa b/tools/boot/sarge/boot-hppa
index 7ac2793d..5451548f 100755
--- a/tools/boot/sarge/boot-hppa
+++ b/tools/boot/sarge/boot-hppa
@@ -45,4 +45,12 @@ cp "$DI_DIR"/initrd.gz "$CDROOT/install"
 
 install_languages "$CDROOT"
 
+echo " -hppa-cmdline '0/vmlinux,root=/dev/ram,initrd=0/ramdisk,init=/linuxrc'" >> $1.mkisofs_opts
+K32=$(ls $CDROOT/install/vmlinux-*-32 | sed 's?^.*/install/?install/?g')
+echo " -hppa-kernel-32 $K32" >> $1.mkisofs_opts
+K64=$(ls $CDROOT/install/vmlinux-*-64 | sed 's?^.*/install/?install/?g')
+echo " -hppa-kernel-64 $K64" >> $1.mkisofs_opts
+echo " -hppa-bootloader install/iplboot" >> $1.mkisofs_opts
+echo " -hppa-ramdisk install/initrd.gz" >> $1.mkisofs_opts
+
 exit 0
diff --git a/tools/boot/sarge/boot-mips b/tools/boot/sarge/boot-mips
index d71985b2..c881f487 100755
--- a/tools/boot/sarge/boot-mips
+++ b/tools/boot/sarge/boot-mips
@@ -20,7 +20,7 @@ if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
 fi
 
-echo -J > $1.mkisofs_opts
+echo "-J" > $1.mkisofs_opts
 
 # Only disk 1* bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then
@@ -39,4 +39,7 @@ install -m 644 -D "$DI_DIR"/r5k-ip22/cdrom-boot.img "$CDROOT"/install/r5k-ip22-b
 
 install_languages $CDROOT
 
+echo " -mips-boot install/r4k-ip22-boot.img" >> $1.mkisofs_opts
+echo " -mips-boot install/r5k-ip22-boot.img" >> $1.mkisofs_opts
+
 exit 0
diff --git a/tools/boot/sarge/boot-mipsel b/tools/boot/sarge/boot-mipsel
index 4d869327..e8bd7feb 100755
--- a/tools/boot/sarge/boot-mipsel
+++ b/tools/boot/sarge/boot-mipsel
@@ -35,7 +35,7 @@ NN=`echo $N | sed -e 's/_NONUS//'`
 
 cd $CDROOT/..
 
-echo -J > $1.mkisofs_opts
+echo "-J" > $1.mkisofs_opts
 
 # Only disks 1 bootable
 if [ $NN != 1 ]; then
@@ -62,4 +62,6 @@ cp "$DI_DIR"/vmlinux-*-r4k-kn04 "$CDROOT/boot/vmlinux-r4k-kn04"
 
 install_languages $CDROOT
 
+echo -n "-mipsel-boot boot/delo.2nd" >> $1.mkisofs_opts
+
 exit 0