From acf036fa7990edd27842e049fe195ee7f0000840 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Fri, 13 Sep 2024 01:13:04 +0200 Subject: [PATCH] qemu-user now includes the static binary and qemu-user-static will be dropped in the long-term --- make_mirror.sh | 2 +- tests/arm64-without-qemu-support | 2 +- tests/i386-which-can-be-executed-without-qemu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/make_mirror.sh b/make_mirror.sh index 419503b..7cc38d1 100755 --- a/make_mirror.sh +++ b/make_mirror.sh @@ -453,7 +453,7 @@ if [ "$HAVE_QEMU" = "yes" ]; then tmpdir="$(mktemp -d)" trap 'kill "$PROXYPID" || :;cleanuptmpdir; cleanup_newcachedir' EXIT INT TERM - pkgs=perl-doc,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,qemu-user-static,qemu-user,dpkg-dev,mini-httpd,libdevel-cover-perl,libtemplate-perl,debootstrap,procps,apt-cudf,aspcud,python3,libcap2-bin,gpg,debootstrap,distro-info-data,iproute2,ubuntu-keyring,apt-utils,squashfs-tools-ng,genext2fs,linux-image-generic,passwd,e2fsprogs,uuid-runtime + pkgs=perl-doc,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,qemu-user-binfmt,dpkg-dev,mini-httpd,libdevel-cover-perl,libtemplate-perl,debootstrap,procps,apt-cudf,aspcud,python3,libcap2-bin,gpg,debootstrap,distro-info-data,iproute2,ubuntu-keyring,apt-utils,squashfs-tools-ng,genext2fs,linux-image-generic,passwd,e2fsprogs,uuid-runtime if [ ! -e ./mmdebstrap ]; then pkgs="$pkgs,mmdebstrap" fi diff --git a/tests/arm64-without-qemu-support b/tests/arm64-without-qemu-support index 98b4724..77c4b20 100644 --- a/tests/arm64-without-qemu-support +++ b/tests/arm64-without-qemu-support @@ -5,7 +5,7 @@ if [ ! -e /mmdebstrap-testenv ]; then echo "this test modifies the system and should only be run inside a container" >&2 exit 1 fi -apt-get remove --yes qemu-user-static binfmt-support qemu-user +apt-get remove --yes qemu-user-binfmt binfmt-support qemu-user # the following is not necessary anymore since systemd-binfmt # successfully disables support upon removal of qemu-user with # the upload of src:systemd 251.2-4: https://bugs.debian.org/1012163 diff --git a/tests/i386-which-can-be-executed-without-qemu b/tests/i386-which-can-be-executed-without-qemu index 91c53df..dd48b39 100644 --- a/tests/i386-which-can-be-executed-without-qemu +++ b/tests/i386-which-can-be-executed-without-qemu @@ -6,7 +6,7 @@ if [ ! -e /mmdebstrap-testenv ]; then exit 1 fi # remove qemu just to be sure -apt-get remove --yes qemu-user-static binfmt-support qemu-user +apt-get remove --yes qemu-user-binfmt binfmt-support qemu-user {{ CMD }} --mode={{ MODE }} --variant=apt --architectures=i386 {{ DIST }} /tmp/debian-chroot.tar {{ MIRROR }} # we ignore differences between architectures by ignoring some files # and renaming others