diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-17 05:26:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-17 05:26:27 +0000 |
| commit | ac6dc478b9a1a0ab8e7247b62b3f582a37e2196f (patch) | |
| tree | a93984405ae70ab4ab5892fe4b6025753a572d35 /mmdebstrap-autopkgtest-build-qemu | |
| parent | Releasing progress-linux version 1.5.2-1~progress7.99u1. (diff) | |
| download | mmdebstrap-ac6dc478b9a1a0ab8e7247b62b3f582a37e2196f.tar.xz mmdebstrap-ac6dc478b9a1a0ab8e7247b62b3f582a37e2196f.zip | |
Merging upstream version 1.5.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mmdebstrap-autopkgtest-build-qemu')
| -rwxr-xr-x | mmdebstrap-autopkgtest-build-qemu | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/mmdebstrap-autopkgtest-build-qemu b/mmdebstrap-autopkgtest-build-qemu index 294ab58..76af46b 100755 --- a/mmdebstrap-autopkgtest-build-qemu +++ b/mmdebstrap-autopkgtest-build-qemu @@ -273,26 +273,14 @@ case "$ARCHITECTURE" in ;; 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 libarchive13; do - test_installed "$pkg" -done - if test "$(dpkg-query -f '${db:Status-Status}' -W binutils-multiarch)" = installed; then GNU_PREFIX= + BINUTILS= else - test_installed dpkg-dev GNU_ARCHITECTURE="$(dpkg-architecture "-a$ARCHITECTURE" -qDEB_HOST_GNU_TYPE)" GNU_PREFIX="$GNU_ARCHITECTURE-" GNU_SUFFIX="-$(echo "$GNU_ARCHITECTURE" | tr _ -)" - test "$(dpkg-query -f '${db:Status-Status}' -W "binutils$GNU_SUFFIX")" = installed || - die "please install binutils$GNU_SUFFIX or binutils-multiarch" + BINUTILS=", binutils$GNU_SUFFIX | binutils-multiarch" fi arches=" $(dpkg --print-architecture) $(dpkg --print-foreign-architectures | tr '\n' ' ') " @@ -301,7 +289,11 @@ case $arches in *) die "enable $ARCHITECTURE by running: sudo dpkg --add-architecture $ARCHITECTURE && sudo apt update" ;; esac -test_installed "systemd-boot-efi:$ARCHITECTURE" +test "$(dpkg-query -f '${db:Status-Status}' -W "dpkg-dev")" = installed || + die "please install dpkg-dev" + +dpkg-checkbuilddeps -d "autopkgtest, dosfstools, e2fsprogs, fdisk, mount, mtools, passwd, uidmap, libarchive13, systemd-boot-efi:$ARCHITECTURE $BINUTILS" /dev/null || + die "please install the required packages listed above" BOOTSTUB="/usr/lib/systemd/boot/efi/linux${EFIIMG#boot}.stub" |