X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Ffiles%2Fsetup-all-dchroots;h=e483895a913f28159be81087b09d5eae004f2cc3;hb=e17f70ac0bb3bf9d91af806d2aa1acecbaadfbbd;hp=dd44981706e88125515efc1deee2a96a5d43f051;hpb=c6d25432be0c14289eb3d12d843a9aba9f186bcf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/files/setup-all-dchroots b/modules/porterbox/files/setup-all-dchroots
index dd4498170..e483895a9 100755
--- a/modules/porterbox/files/setup-all-dchroots
+++ b/modules/porterbox/files/setup-all-dchroots
@@ -33,12 +33,15 @@ UNAMEARCH=$(uname -m)
 
 get_suites() {
     case "$1" in
-      armel|s390x)
+      armhf|s390x)
         echo "sid jessie wheezy"
         ;;
       s390)
         echo "wheezy squeeze"
         ;;
+      sparc)
+        echo "sid wheezy squeeze"
+        ;;
       *)
         echo "sid jessie wheezy squeeze"
         ;;
@@ -53,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"
         ;;
@@ -62,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