Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / schroot / files / setup-all-dchroots

diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
index f29d0a0..6e08179 100755 (executable)
--- a/modules/schroot/files/setup-all-dchroots
+++ b/modules/schroot/files/setup-all-dchroots
@@ -41,66 +41,53 @@ else
     MODE=porterbox
 fi
 
+if [ -t 0 ] ; then
+    SILENT=""
+else
+    SILENT="chronic"
+fi
+
 get_suites() {
     case "$1" in
       amd64|i386|armel|armhf)
-        echo "sid buster stretch jessie wheezy"
-        ;;
-      kfreebsd-*)
-        echo "sid         jessie"
-        ;;
-      mips64el)
-        echo "sid buster stretch"
+        echo "sid buster stretch jessie"
         ;;
       powerpc)
-        echo "sid         jessie"
-        ;;
-      ppc64)
         echo "sid"
         ;;
       *)
-        echo "sid buster stretch jessie"
+        echo "sid buster stretch"
         ;;
     esac
 }
 
 extra=""
 
-case `hostname` in
-    pizzetti)
-        archs="ppc64"
-        extra="$extra -m http://ftp.de.debian.org/debian-ports"
-        extra="$extra -k /root/debian-ports-archive-2017.gpg"
-        extra="$extra -I debian-ports-archive-keyring"
-        ;;
-    *)
-        archs="$DPKGARCH"
-        case "$DPKGARCH" in
-            amd64)
-                archs="$archs i386"
-                ;;
-            arm64)
-                archs="$archs armhf armel"
-                ;;
-            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
-                ;;
-            mips64el)
-                archs="$archs mipsel"
-                ;;
-            mipsel)
-                archs="$archs mips64el"
-                ;;
-        esac
-    ;;
+archs="$DPKGARCH"
+case "$DPKGARCH" in
+    amd64)
+       archs="$archs i386"
+       ;;
+    arm64)
+       archs="$archs armhf armel"
+       ;;
+    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
+       ;;
+    mips64el)
+       archs="$archs mipsel"
+       ;;
+    mipsel)
+       archs="$archs mips64el"
+       ;;
 esac
 
 err=0
@@ -112,13 +99,13 @@ do_one() {
     case "$MODE" in
         buildd)
             mkdir -p /srv/buildd/unpack
-            if ! chronic setup-dchroot -f -a "$a" $extra -D -d '/srv/buildd/unpack' -K "$s"
+            if ! $SILENT setup-dchroot -f -a "$a" $extra -D -d '/srv/buildd/unpack' -K "$s"
             then
                 return 1
             fi
             ;;
         porterbox)
-            if ! chronic setup-dchroot -f -a "$a" $extra "$s"
+            if ! $SILENT setup-dchroot -f -a "$a" $extra "$s"
             then
                 return 1
             fi