forked from josch/mmdebstrap
mmdebstrap-autopkgtest-build-qemu: selects wrong kernel package for armhf
Package: mmdebstrap Version: 1.5.0-2 Severity: normal Tags: patch With --architecture=armhf, mmdebstrap-autopkgtest-build-qemu fails with "E: Unable to locate package linux-image-armhf". The following patch fixes that. i386 has a similar problem, and I included a fix for that in this patch too, though I haven't tested that. After this, armhf still fails with: arm-linux-gnueabihf-objdump: /usr/lib/systemd/boot/efi/linuxarm.efi.stub: file format not recognized failed to discover the alignment of the efi stub ... but that's a separate problem.
This commit is contained in:
parent
d0c30c70bd
commit
bda207af63
1 changed files with 6 additions and 1 deletions
|
@ -235,26 +235,31 @@ case "$ARCHITECTURE" in
|
||||||
EFIIMG=bootx64.efi
|
EFIIMG=bootx64.efi
|
||||||
QEMUARCH=x86_64
|
QEMUARCH=x86_64
|
||||||
VMFPKG=ovmf
|
VMFPKG=ovmf
|
||||||
|
LINUXIMAGE=linux-image-amd64
|
||||||
;;
|
;;
|
||||||
arm64)
|
arm64)
|
||||||
EFIIMG=bootaa64.efi
|
EFIIMG=bootaa64.efi
|
||||||
QEMUARCH=aarch64
|
QEMUARCH=aarch64
|
||||||
VMFPKG=qemu-efi-aarch64
|
VMFPKG=qemu-efi-aarch64
|
||||||
|
LINUXIMAGE=linux-image-arm64
|
||||||
;;
|
;;
|
||||||
armhf)
|
armhf)
|
||||||
EFIIMG=bootarm.efi
|
EFIIMG=bootarm.efi
|
||||||
QEMUARCH=arm
|
QEMUARCH=arm
|
||||||
VMFPKG=qemu-efi-arm
|
VMFPKG=qemu-efi-arm
|
||||||
|
LINUXIMAGE=linux-image-armmp
|
||||||
;;
|
;;
|
||||||
i386)
|
i386)
|
||||||
EFIIMG=bootia32.efi
|
EFIIMG=bootia32.efi
|
||||||
QEMUARCH=i386
|
QEMUARCH=i386
|
||||||
VMFPKG=ovmf-ia32
|
VMFPKG=ovmf-ia32
|
||||||
|
LINUXIMAGE=linux-image-686-pae
|
||||||
;;
|
;;
|
||||||
riscv64)
|
riscv64)
|
||||||
EFIIMG=bootriscv64.efi
|
EFIIMG=bootriscv64.efi
|
||||||
QEMUARCH=riscv64
|
QEMUARCH=riscv64
|
||||||
VMFPKG=
|
VMFPKG=
|
||||||
|
LINUXIMAGE=linux-image-riscv64
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
die "unsupported architecture: $ARCHITECTURE"
|
die "unsupported architecture: $ARCHITECTURE"
|
||||||
|
@ -344,7 +349,7 @@ test "$RELEASE" = jessie &&
|
||||||
set -- "$@" --hook-dir=/usr/share/mmdebstrap/hooks/jessie-or-older
|
set -- "$@" --hook-dir=/usr/share/mmdebstrap/hooks/jessie-or-older
|
||||||
|
|
||||||
set -- "$@" \
|
set -- "$@" \
|
||||||
"--include=init,linux-image-$ARCHITECTURE,python3" \
|
"--include=init,$LINUXIMAGE,python3" \
|
||||||
'--customize-hook=echo host >"$1/etc/hostname"' \
|
'--customize-hook=echo host >"$1/etc/hostname"' \
|
||||||
'--customize-hook=echo 127.0.0.1 localhost host >"$1/etc/hosts"' \
|
'--customize-hook=echo 127.0.0.1 localhost host >"$1/etc/hosts"' \
|
||||||
'--customize-hook=passwd --root "$1" --delete root' \
|
'--customize-hook=passwd --root "$1" --delete root' \
|
||||||
|
|
Loading…
Reference in a new issue