projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'zobel-salsa/zobel-salsa'
[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
6204dbd
..
4de0f83
100755
(executable)
--- a/
modules/schroot/files/setup-all-dchroots
+++ b/
modules/schroot/files/setup-all-dchroots
@@
-43,49
+43,48
@@
fi
get_suites() {
case "$1" in
get_suites() {
case "$1" in
- a
rmhf|s390x
)
- echo "sid stretch jessie wheezy"
+ a
md64|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 stretch jessie"
- ;;
- amd64|i386)
- echo "sid stretch jessie wheezy squeeze"
+ powerpc)
+ echo "sid jessie"
;;
*)
;;
*)
- echo "sid
stretch jessie wheezy
"
+ echo "sid
buster stretch jessie
"
;;
esac
}
;;
esac
}
+extra=""
+
archs="$DPKGARCH"
case "$DPKGARCH" in
amd64)
archs="$DPKGARCH"
case "$DPKGARCH" in
amd64)
-
archs="$archs i386"
-
;;
+ archs="$archs i386"
+ ;;
arm64)
arm64)
-
archs="$archs armhf armel"
-
;;
+ archs="$archs armhf armel"
+ ;;
armhf)
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)
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
esac
err=0
@@
-97,13
+96,13
@@
do_one() {
case "$MODE" in
buildd)
mkdir -p /srv/buildd/unpack
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)
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
then
return 1
fi