X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fsetup-all-dchroots;h=efb920fd4003cffe262c9f7c505355461225b38e;hb=190141f23da1499f30a680f5f00412326deace0d;hp=15044f7739e8240f0af60e85498d08c787c845db;hpb=711724f582aa734ed8501a3cc29fec99bd4bd2b9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/setup-all-dchroots b/modules/porterbox/files/setup-all-dchroots
index 15044f773..efb920fd4 100755
--- a/modules/porterbox/files/setup-all-dchroots
+++ b/modules/porterbox/files/setup-all-dchroots
@@ -36,12 +36,21 @@ get_suites() {
       armhf|s390x)
         echo "sid jessie wheezy"
         ;;
-      s390)
-        echo "wheezy squeeze"
+      ia64|s390)
+        echo "wheezy"
         ;;
-      *)
+      sparc)
+        echo "sid wheezy"
+        ;;
+      arm64)
+        echo "sid jessie"
+        ;;
+      amd64|i386)
         echo "sid jessie wheezy squeeze"
         ;;
+      *)
+        echo "sid jessie wheezy"
+        ;;
     esac
 }
 
@@ -51,8 +60,16 @@ case "$DPKGARCH" in
         archs="$archs i386"
         ;;
     armhf)
+        if [ "$(uname -m)" = "aarch64" ] ; then
+            archs="$archs arm64"
+        fi
         archs="$archs armel"
         ;;
+    armel)
+        if [ "$(uname -m)" = "armv7l" ] && grep -w vfpv3 -q /proc/cpuinfo ; then
+            archs="$archs armhf"
+        fi
+        ;;
     s390|s390x)
         archs="s390 s390x"
         ;;
@@ -62,7 +79,13 @@ err=0
 
 for a in $archs; do
     for s in `get_suites "$a"`; do
-        setup-dchroot -f -a "$a" "$s" || err=1
+        if ! chronic setup-dchroot -f -a "$a" "$s"; then
+            err=1
+            echo >&2
+            echo >&2 "Error: setting up $s:$a dchroot failed."
+            echo >&2
+            echo >&2
+        fi
     done
 done