From c0813db7f7bdee22e24fb8c602b9efac3b294259 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Tue, 8 Apr 2014 18:44:36 +0100
Subject: [PATCH] Fixes for booting on hppa architecture. Closes: #743879

---
 debian/changelog            |  3 +++
 tools/boot/jessie/boot-hppa | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4b8cc9d..66d22e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ debian-cd (3.1.15) UNRELEASED; urgency=low
     otherwise if we're running on a multi-arch system apt will break
   * Factor out the xorriso version-checking code
 
+  [ Helge Deller ]
+  * Fixes for booting on hppa architecture. Closes: #743879
+
  -- Steve McIntyre <93sam@debian.org>  Tue, 11 Feb 2014 01:57:01 +0000
 
 debian-cd (3.1.14) unstable; urgency=medium
diff --git a/tools/boot/jessie/boot-hppa b/tools/boot/jessie/boot-hppa
index 3cb520d1..84fa250e 100755
--- a/tools/boot/jessie/boot-hppa
+++ b/tools/boot/jessie/boot-hppa
@@ -30,7 +30,6 @@ if [ -z "$PALODEB" ] ; then
 fi
 (dpkg --fsys-tarfile "$MIRROR/$PALODEB" | \
     tar xf - -C . ./usr/share/palo/iplboot)
-mv boot/delo.2nd $CDROOT/boot/delo.2nd
 mv usr/share/palo/iplboot $CDROOT/install/iplboot
 
 if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
@@ -48,18 +47,19 @@ else
 	wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
 fi
 	
-cp "$DI_DIR"/vmlinux-*-parisc "$CDROOT/install"
-cp "$DI_DIR"/vmlinux-*-parisc64 "$CDROOT/install"
+K32=$(basename "$DI_DIR"/vmlinux-*-parisc)
+K64=$(basename "$DI_DIR"/vmlinux-*-parisc64*)
+
+# palo >= 1.91 can load gzip-compressed Linux kernels
+gzip -c "$DI_DIR"/$K32 > "$CDROOT/install"/$K32
+gzip -c "$DI_DIR"/$K64 > "$CDROOT/install"/$K64
 cp "$DI_DIR"/initrd.gz "$CDROOT/install"
 
 install_languages "$CDROOT"
 
-K32=$(ls $CDROOT/install/vmlinux-*-parisc|head -1 | sed 's?^.*/install/?install/?g')
-K64=$(ls $CDROOT/install/vmlinux-*-parisc64|head -1 | sed 's?^.*/install/?install/?g')
-
 add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
-add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-32 $K32"
-add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-64 $K64"
+add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-32 install/$K32"
+add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-64 install/$K64"
 add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-bootloader install/iplboot"
 add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-ramdisk install/initrd.gz"