X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-all-dchroots;h=4de0f8363e5ac56abb09426ca1513cbbd8fc0974;hb=0f51d271af05aadcd1e95ad8359634a3882bcf88;hp=7bc1a97623186261f0c3d4ec5d3d0ffa7b9d4119;hpb=086a85e483cb3725ed4f0c75d9dfbf6c078a4299;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
index 7bc1a9762..4de0f8363 100755
--- a/modules/schroot/files/setup-all-dchroots
+++ b/modules/schroot/files/setup-all-dchroots
@@ -43,72 +43,48 @@ fi
 
 get_suites() {
     case "$1" in
-      ia64|s390|sparc)
-        echo "wheezy"
-        ;;
-      arm64|ppc64el)
-        echo "sid stretch jessie"
-        ;;
-      amd64|i386)
-        echo "sid stretch jessie wheezy"
-        ;;
-      kfreebsd-*)
-        echo "sid         jessie wheezy"
+      amd64|i386|armel|armhf)
+        echo "sid buster stretch jessie wheezy"
         ;;
       mips64el)
-        echo "sid"
+        echo "sid buster stretch"
         ;;
-      ppc64)
-        echo "sid"
+      powerpc)
+        echo "sid         jessie"
         ;;
       *)
-        echo "sid stretch jessie wheezy"
+        echo "sid buster stretch jessie"
         ;;
     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-2016.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)
-                if grep -w "Loongson-3" -q /proc/cpuinfo ; then
-                    archs="$archs mips64el"
-                fi
-                ;;
-            s390|s390x)
-                archs="s390 s390x"
-                ;;
-        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