X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fsetup-all-dchroots;h=448289287168e07b07e6f846dd3fe8474b66133e;hb=5e6d9dff0b2445ea867131e13d7a793cd8649e48;hp=93d9c8b25dcba1b4147f41793e5dd8777eb94b68;hpb=6c1ddb4d3292d02659f13442e82a89a63ab006ae;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/setup-all-dchroots b/modules/porterbox/files/setup-all-dchroots
index 93d9c8b25..448289287 100755
--- a/modules/porterbox/files/setup-all-dchroots
+++ b/modules/porterbox/files/setup-all-dchroots
@@ -33,9 +33,15 @@ UNAMEARCH=$(uname -m)
 
 get_suites() {
     case "$1" in
-      armel|s390x)
+      armhf|s390x)
         echo "sid jessie wheezy"
         ;;
+      ia64|s390)
+        echo "wheezy squeeze"
+        ;;
+      sparc)
+        echo "sid wheezy squeeze"
+        ;;
       *)
         echo "sid jessie wheezy squeeze"
         ;;
@@ -50,6 +56,11 @@ case "$DPKGARCH" in
     armhf)
         archs="$archs armel"
         ;;
+    armel)
+        if [ "$(uname -m)" = "armv7l" ] && grep -w vfpv3 -q /proc/cpuinfo ; then
+            archs="$archs armhf"
+        fi
+        ;;
     s390|s390x)
         archs="s390 s390x"
         ;;
@@ -59,7 +70,13 @@ err=0
 
 for a in $archs; do
     for s in `get_suites "$a"`; do
-        setup-dchroot -f -a "$a" "$s" || err=1
+        if ! 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