abuild: set -e fix for update_config_{sub,guess}
This commit is contained in:
parent
1ddc910eb3
commit
ecc1f509c6
16
abuild.in
16
abuild.in
@ -532,8 +532,7 @@ mkusers() {
|
|||||||
|
|
||||||
# helper to update config.sub to a recent version
|
# helper to update config.sub to a recent version
|
||||||
update_config_sub() {
|
update_config_sub() {
|
||||||
local changed=false
|
find . -name config.sub | (local changed=false; while read f; do
|
||||||
find . -name config.sub | while read f; do
|
|
||||||
if ! ./$f armv6-alpine-linux-muslgnueabihf 2>/dev/null; then
|
if ! ./$f armv6-alpine-linux-muslgnueabihf 2>/dev/null; then
|
||||||
msg "Updating $f"
|
msg "Updating $f"
|
||||||
cp "$datadir"/${f##*/} "$f" || return 1
|
cp "$datadir"/${f##*/} "$f" || return 1
|
||||||
@ -541,16 +540,12 @@ update_config_sub() {
|
|||||||
else
|
else
|
||||||
msg "No update needed for $f"
|
msg "No update needed for $f"
|
||||||
fi
|
fi
|
||||||
# pipe subshell will return status of last command
|
done; $changed)
|
||||||
$changed
|
|
||||||
done
|
|
||||||
return $?
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# helper to update config.guess to a recent version
|
# helper to update config.guess to a recent version
|
||||||
update_config_guess() {
|
update_config_guess() {
|
||||||
local changed=false
|
find . -name config.guess | (local changed=false; while read f; do
|
||||||
find . -name config.guess | while read f; do
|
|
||||||
if grep -q aarch64 "$f" && grep -q ppc64le "$f"; then
|
if grep -q aarch64 "$f" && grep -q ppc64le "$f"; then
|
||||||
msg "No update needed for $f"
|
msg "No update needed for $f"
|
||||||
else
|
else
|
||||||
@ -558,10 +553,7 @@ update_config_guess() {
|
|||||||
cp "$datadir"/${f##*/} "$f" || return 1
|
cp "$datadir"/${f##*/} "$f" || return 1
|
||||||
changed=true
|
changed=true
|
||||||
fi
|
fi
|
||||||
# pipe subshell will return status of last command
|
done; $changed)
|
||||||
$changed
|
|
||||||
done
|
|
||||||
return $?
|
|
||||||
}
|
}
|
||||||
|
|
||||||
runpart() {
|
runpart() {
|
||||||
|
Reference in New Issue
Block a user