X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-all-dchroots;h=c75722287762f823a4c7e6ee60593ef6b661bfe4;hb=6d3f386e0e197b73d031d3276d969170ed868766;hp=f528b3b0ce74dcd0b21be13b248571e23b39886b;hpb=87e1beaf8531e1ff87b0fa5dbfcda1093b25fcd7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
index f528b3b0c..c75722287 100755
--- a/modules/schroot/files/setup-all-dchroots
+++ b/modules/schroot/files/setup-all-dchroots
@@ -43,26 +43,22 @@ fi
 
 get_suites() {
     case "$1" in
-      ia64|s390|sparc)
-        echo "wheezy"
-        ;;
-      arm64|ppc64el)
-        echo "sid stretch jessie"
-        ;;
-      amd64|i386)
-        echo "sid stretch jessie wheezy squeeze"
+      amd64|i386|armel|armhf)
+        echo "sid stretch jessie wheezy"
         ;;
       kfreebsd-*)
-        echo "sid         jessie wheezy"
+        echo "sid         jessie"
         ;;
       mips64el)
-        echo "sid"
+        echo "sid stretch"
         ;;
       ppc64)
         echo "sid"
         ;;
+      ia64)
+	;;
       *)
-        echo "sid stretch jessie wheezy"
+        echo "sid stretch jessie"
         ;;
     esac
 }
@@ -73,7 +69,7 @@ case `hostname` in
     pizzetti)
         archs="ppc64"
         extra="$extra -m http://ftp.de.debian.org/debian-ports"
-        extra="$extra -k /root/debian-ports-archive-2015.gpg"
+        extra="$extra -k /root/debian-ports-archive-2016.gpg"
         extra="$extra -I debian-ports-archive-keyring"
         ;;
     *)
@@ -100,12 +96,7 @@ case `hostname` in
                 archs="$archs mipsel"
                 ;;
             mipsel)
-                if grep -w "Loongson-3" /proc/cpuinfo ; then
-                    archs="$archs mips64el"
-                fi
-                ;;
-            s390|s390x)
-                archs="s390 s390x"
+                archs="$archs mips64el"
                 ;;
         esac
     ;;