projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New dillon volume
[mirror/dsa-puppet.git]
/
modules
/
porterbox
/
files
/
setup-all-dchroots
diff --git
a/modules/porterbox/files/setup-all-dchroots
b/modules/porterbox/files/setup-all-dchroots
index
15044f7
..
efb920f
100755
(executable)
--- a/
modules/porterbox/files/setup-all-dchroots
+++ b/
modules/porterbox/files/setup-all-dchroots
@@
-36,12
+36,21
@@
get_suites() {
armhf|s390x)
echo "sid jessie wheezy"
;;
armhf|s390x)
echo "sid jessie wheezy"
;;
- s390)
- echo "wheezy
squeeze
"
+
ia64|
s390)
+ echo "wheezy"
;;
;;
- *)
+ sparc)
+ echo "sid wheezy"
+ ;;
+ arm64)
+ echo "sid jessie"
+ ;;
+ amd64|i386)
echo "sid jessie wheezy squeeze"
;;
echo "sid jessie wheezy squeeze"
;;
+ *)
+ echo "sid jessie wheezy"
+ ;;
esac
}
esac
}
@@
-51,8
+60,16
@@
case "$DPKGARCH" in
archs="$archs i386"
;;
armhf)
archs="$archs i386"
;;
armhf)
+ if [ "$(uname -m)" = "aarch64" ] ; then
+ archs="$archs arm64"
+ fi
archs="$archs armel"
;;
archs="$archs armel"
;;
+ armel)
+ if [ "$(uname -m)" = "armv7l" ] && grep -w vfpv3 -q /proc/cpuinfo ; then
+ archs="$archs armhf"
+ fi
+ ;;
s390|s390x)
archs="s390 s390x"
;;
s390|s390x)
archs="s390 s390x"
;;
@@
-62,7
+79,13
@@
err=0
for a in $archs; do
for s in `get_suites "$a"`; do
for a in $archs; do
for s in `get_suites "$a"`; do
- setup-dchroot -f -a "$a" "$s" || err=1
+ if ! chronic setup-dchroot -f -a "$a" "$s"; then
+ err=1
+ echo >&2
+ echo >&2 "Error: setting up $s:$a dchroot failed."
+ echo >&2
+ echo >&2
+ fi
done
done
done
done