From 961675368f06652b4cbcef3c4da19ad0462d98e7 Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Thu, 16 Jan 2020 13:08:58 +0100 Subject: [PATCH] make_mirror.sh: only install proot if HAVE_PROOT==yes --- make_mirror.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/make_mirror.sh b/make_mirror.sh index 5f8f5a5..821f01e 100755 --- a/make_mirror.sh +++ b/make_mirror.sh @@ -331,6 +331,7 @@ components=main : "${DEFAULT_DIST:=unstable}" : "${HAVE_QEMU:=yes}" : "${RUN_MA_SAME_TESTS:=yes}" +: "${HAVE_PROOT:=yes}" if [ -e "$oldmirrordir/dists/$DEFAULT_DIST/Release" ]; then http_code=$(curl --output /dev/null --silent --location --head --time-cond "$oldmirrordir/dists/$DEFAULT_DIST/Release" --write-out '%{http_code}' "$mirror/dists/$DEFAULT_DIST/Release") @@ -407,7 +408,10 @@ if [ "$HAVE_QEMU" = "yes" ]; then tmpdir="$(mktemp -d)" trap "cleanuptmpdir; cleanup_newcachedir" EXIT INT TERM - pkgs=perl-doc,linux-image-amd64,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,proot,qemu-user-static,binfmt-support,qemu-user,dpkg-dev,mini-httpd,libdevel-cover-perl,debootstrap,procps,apt-cudf,aspcud,squashfs-tools-ng + pkgs=perl-doc,linux-image-amd64,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,qemu-user-static,binfmt-support,qemu-user,dpkg-dev,mini-httpd,libdevel-cover-perl,debootstrap,procps,apt-cudf,aspcud,squashfs-tools-ng + if [ "$HAVE_PROOT" = "yes" ]; then + pkgs="$pkgs,proot" + fi if [ "$HOSTARCH" = amd64 ] && [ "$RUN_MA_SAME_TESTS" = "yes" ]; then arches=amd64,armhf pkgs="$pkgs,libfakechroot:armhf,libfakeroot:armhf"