josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

make_mirror.sh: also install foreign amd64 on arm64

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2023-01-16 07:44:38 +01:00
parent 3b953d4398
commit e93c145822
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
make_mirror.sh
View file

@ -417,10 +417,11 @@ mkdir -p "$newcachedir"
touch "$newcachedir/mmdebstrapcache" touch "$newcachedir/mmdebstrapcache"
HOSTARCH=$(dpkg --print-architecture) HOSTARCH=$(dpkg --print-architecture)
arches="$HOSTARCH"
if [ "$HOSTARCH" = amd64 ]; then if [ "$HOSTARCH" = amd64 ]; then
arches="amd64 arm64 i386" arches="$arches arm64 i386"
else elif [ "$HOSTARCH" = arm64 ]; then
arches="$HOSTARCH" arches="$arches amd64 armhf"
fi fi
for nativearch in $arches; do for nativearch in $arches; do
@ -533,6 +534,9 @@ if [ "$HAVE_QEMU" = "yes" ]; then
if [ "$HOSTARCH" = amd64 ] && [ "$RUN_MA_SAME_TESTS" = "yes" ]; then if [ "$HOSTARCH" = amd64 ] && [ "$RUN_MA_SAME_TESTS" = "yes" ]; then
arches=amd64,arm64 arches=amd64,arm64
pkgs="$pkgs,libfakechroot:arm64,libfakeroot: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 else
arches=$HOSTARCH arches=$HOSTARCH
fi fi