X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fsetup-all-dchroots;h=4de0f8363e5ac56abb09426ca1513cbbd8fc0974;hb=01224a1c8744adc357f1cedeb512ff8c779ae565;hp=66fd9ebb0b9d6fd5e33a923c922e8c3b44053576;hpb=603f282493fd2c78e66323cdce5e6192f4aa2336;p=mirror%2Fdsa-puppet.git diff --git a/modules/schroot/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots index 66fd9ebb0..4de0f8363 100755 --- a/modules/schroot/files/setup-all-dchroots +++ b/modules/schroot/files/setup-all-dchroots @@ -43,49 +43,48 @@ fi get_suites() { case "$1" in - armhf|s390x) - echo "sid jessie wheezy" + amd64|i386|armel|armhf) + echo "sid buster stretch jessie wheezy" ;; - ia64|s390) - echo "wheezy" + mips64el) + echo "sid buster stretch" ;; - sparc) - echo "sid wheezy" - ;; - arm64|ppc64el) - echo "sid jessie" - ;; - amd64|i386) - echo "sid jessie wheezy squeeze" + powerpc) + echo "sid jessie" ;; *) - echo "sid jessie wheezy" + echo "sid buster stretch jessie" ;; esac } +extra="" + archs="$DPKGARCH" case "$DPKGARCH" in amd64) - archs="$archs i386" - ;; + archs="$archs i386" + ;; arm64) - archs="$archs armhf armel" - ;; + archs="$archs armhf armel" + ;; armhf) - if [ "$(uname -m)" = "aarch64" ] ; then - archs="$archs arm64" - fi - archs="$archs armel" - ;; + 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 - ;; - s390|s390x) - archs="s390 s390x" - ;; + 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 @@ -97,13 +96,13 @@ do_one() { case "$MODE" in buildd) mkdir -p /srv/buildd/unpack - if ! chronic setup-dchroot -f -a "$a" -D -d '/srv/buildd/unpack' -K "$s" + if ! chronic 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" "$s" + if ! chronic setup-dchroot -f -a "$a" $extra "$s" then return 1 fi