Updates for hppa from Helge Deller
Previous changes enabled gzip compressed Linux kernels, but not 100% sure that it works on all systems. Disable this compression for now. Switch hppa to use xorriso by default instead of mkisofs. Xorriso supports kernel command lines to be up to 1023 bytes, better than mkisofs. mkisofs only supports the older palo version 4 header format which can hold only 127 characters which might be too small.
This commit is contained in:
parent
2338730341
commit
c949504c2e
2
Makefile
2
Makefile
|
@ -21,7 +21,7 @@ ifndef TASK
|
|||
TASK=Debian-generic
|
||||
endif
|
||||
ifndef MKISOFS
|
||||
ifneq (,$(filter i386 amd64 arm64,$(ARCHES)))
|
||||
ifneq (,$(filter i386 amd64 arm64 hppa,$(ARCHES)))
|
||||
export MKISOFS=xorriso
|
||||
export MKISOFS_OPTS=-as mkisofs -r -checksum_algorithm_iso md5,sha1
|
||||
else
|
||||
|
|
|
@ -58,6 +58,9 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
|
|||
[ Nicholas D Steeves ]
|
||||
* Change dependency on btrfs-tools to btrfs-progs. Closes: #820479
|
||||
|
||||
[ Helge Deller ]
|
||||
* Update hppa support. Closes: #744155
|
||||
|
||||
-- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100
|
||||
|
||||
debian-cd (3.1.17) unstable; urgency=medium
|
||||
|
|
|
@ -50,9 +50,8 @@ fi
|
|||
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"/$K32 "$CDROOT/install"/$K32
|
||||
cp "$DI_DIR"/$K64 "$CDROOT/install"/$K64
|
||||
cp "$DI_DIR"/initrd.gz "$CDROOT/install"
|
||||
|
||||
install_languages "$CDROOT"
|
||||
|
|
|
@ -50,9 +50,8 @@ fi
|
|||
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"/$K32 "$CDROOT/install"/$K32
|
||||
cp "$DI_DIR"/$K64 "$CDROOT/install"/$K64
|
||||
cp "$DI_DIR"/initrd.gz "$CDROOT/install"
|
||||
|
||||
add_mkisofs_opt $CDROOT/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
|
||||
|
|
Loading…
Reference in New Issue