From e93c145822a38874bef237b4269e7c034bd9e4e5 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 16 Jan 2023 07:44:38 +0100 Subject: [PATCH] make_mirror.sh: also install foreign amd64 on arm64 --- make_mirror.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/make_mirror.sh b/make_mirror.sh index 58a287c..ed0a79b 100755 --- a/make_mirror.sh +++ b/make_mirror.sh @@ -417,10 +417,11 @@ mkdir -p "$newcachedir" touch "$newcachedir/mmdebstrapcache" HOSTARCH=$(dpkg --print-architecture) +arches="$HOSTARCH" if [ "$HOSTARCH" = amd64 ]; then - arches="amd64 arm64 i386" -else - arches="$HOSTARCH" + arches="$arches arm64 i386" +elif [ "$HOSTARCH" = arm64 ]; then + arches="$arches amd64 armhf" fi for nativearch in $arches; do @@ -533,6 +534,9 @@ if [ "$HAVE_QEMU" = "yes" ]; then if [ "$HOSTARCH" = amd64 ] && [ "$RUN_MA_SAME_TESTS" = "yes" ]; then arches=amd64,arm64 pkgs="$pkgs,libfakechroot:arm64,libfakeroot:arm64" + elif [ "$HOSTARCH" = arm64 ] && [ "$RUN_MA_SAME_TESTS" = "yes" ]; then + arches=arm64,amd64 + pkgs="$pkgs,libfakechroot:amd64,libfakeroot:amd64" else arches=$HOSTARCH fi