Add test if dpkg-dev is installed
Needed for dpkg-architecture.
This commit is contained in:
parent
8c0ddc3266
commit
4a294f05bd
1 changed files with 13 additions and 5 deletions
|
@ -261,9 +261,21 @@ case "$ARCHITECTURE" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
test_installed() {
|
||||||
|
pkg="$1"
|
||||||
|
if [ "$(dpkg-query -f '${db:Status-Status}' -W "$pkg")" != installed ]; then
|
||||||
|
die "please install $pkg"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
for pkg in autopkgtest dosfstools e2fsprogs fdisk mount mtools passwd uidmap; do
|
||||||
|
test_installed "$pkg"
|
||||||
|
done
|
||||||
|
|
||||||
if test "$(dpkg-query -f '${db:Status-Status}' -W binutils-multiarch)" = installed; then
|
if test "$(dpkg-query -f '${db:Status-Status}' -W binutils-multiarch)" = installed; then
|
||||||
GNU_PREFIX=
|
GNU_PREFIX=
|
||||||
else
|
else
|
||||||
|
test_installed dpkg-dev
|
||||||
GNU_ARCHITECTURE="$(dpkg-architecture "-a$ARCHITECTURE" -qDEB_HOST_GNU_TYPE)"
|
GNU_ARCHITECTURE="$(dpkg-architecture "-a$ARCHITECTURE" -qDEB_HOST_GNU_TYPE)"
|
||||||
GNU_PREFIX="$GNU_ARCHITECTURE-"
|
GNU_PREFIX="$GNU_ARCHITECTURE-"
|
||||||
GNU_SUFFIX="-$(echo "$GNU_ARCHITECTURE" | tr _ -)"
|
GNU_SUFFIX="-$(echo "$GNU_ARCHITECTURE" | tr _ -)"
|
||||||
|
@ -277,11 +289,7 @@ case $arches in
|
||||||
*) die "enable $ARCHITECTURE by running: sudo dpkg --add-architecture $ARCHITECTURE && sudo apt update" ;;
|
*) die "enable $ARCHITECTURE by running: sudo dpkg --add-architecture $ARCHITECTURE && sudo apt update" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
for pkg in autopkgtest dosfstools e2fsprogs fdisk mount mtools passwd "systemd-boot-efi:$ARCHITECTURE" uidmap; do
|
test_installed "systemd-boot-efi:$ARCHITECTURE"
|
||||||
if [ "$(dpkg-query -f '${db:Status-Status}' -W "$pkg")" != installed ]; then
|
|
||||||
die "please install $pkg"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
BOOTSTUB="/usr/lib/systemd/boot/efi/linux${EFIIMG#boot}.stub"
|
BOOTSTUB="/usr/lib/systemd/boot/efi/linux${EFIIMG#boot}.stub"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue