Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for booting on hppa architecture. Closes: #743879

This commit is contained in:
Steve McIntyre 2014-04-08 18:44:36 +01:00
parent 6b0e67d201
commit c0813db7f7
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -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 otherwise if we're running on a multi-arch system apt will break
* Factor out the xorriso version-checking code * 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 -- Steve McIntyre <93sam@debian.org> Tue, 11 Feb 2014 01:57:01 +0000
debian-cd (3.1.14) unstable; urgency=medium debian-cd (3.1.14) unstable; urgency=medium

16
tools/boot/jessie/boot-hppa
View File

@ -30,7 +30,6 @@ if [ -z "$PALODEB" ] ; then
fi fi
(dpkg --fsys-tarfile "$MIRROR/$PALODEB" | \ (dpkg --fsys-tarfile "$MIRROR/$PALODEB" | \
tar xf - -C . ./usr/share/palo/iplboot) tar xf - -C . ./usr/share/palo/iplboot)
mv boot/delo.2nd $CDROOT/boot/delo.2nd
mv usr/share/palo/iplboot $CDROOT/install/iplboot mv usr/share/palo/iplboot $CDROOT/install/iplboot
if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
@ -48,18 +47,19 @@ else
wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME" wget -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
fi fi
cp "$DI_DIR"/vmlinux-*-parisc "$CDROOT/install" K32=$(basename "$DI_DIR"/vmlinux-*-parisc)
cp "$DI_DIR"/vmlinux-*-parisc64 "$CDROOT/install" 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" cp "$DI_DIR"/initrd.gz "$CDROOT/install"
install_languages "$CDROOT" 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-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-32 install/$K32"
add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-kernel-64 $K64" 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-bootloader install/iplboot"
add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-ramdisk install/initrd.gz" add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-ramdisk install/initrd.gz"