summaryrefslogtreecommitdiff
path: root/update-archlinux32-package
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-05-29 11:00:30 +0200
committerErich Eckner <git@eckner.net>2020-05-29 11:00:30 +0200
commitdabed2b92fe49dd5b88dd942a7dd26a9e4477d3d (patch)
tree7b2c1329effb7237286023a224a39a3e4092aa23 /update-archlinux32-package
parentbf79e39a8e75add0c694b6eef7c68d0f5233fe9e (diff)
downloaddevops-dabed2b92fe49dd5b88dd942a7dd26a9e4477d3d.tar.xz
update-archlinux32-package: error out if `make olddefconfig` did not finish
Diffstat (limited to 'update-archlinux32-package')
-rwxr-xr-xupdate-archlinux32-package9
1 files changed, 5 insertions, 4 deletions
diff --git a/update-archlinux32-package b/update-archlinux32-package
index fd0b6e2..4f3b2b7 100755
--- a/update-archlinux32-package
+++ b/update-archlinux32-package
@@ -469,8 +469,9 @@ case ${update_path} in
/^arch=[^#]*any/!{
/^arch=(/s/(/(i486 i686 pentium4 /
}
- /^\s*cp .\+ \.config\s$/ a make oldconfig
- s/^}$/return 1\n\0/
+ /^\s*cp .\+ \.config\s*$/ a make olddefconfig \
+ mv .config .processed-config \
+ return 1
'"'"' PKGBUILD
' < \
"${git_repo_path}/${repo}/${pkgname}/PKGBUILD"
@@ -484,9 +485,9 @@ case ${update_path} in
else
CARCH=${config_name#config.} makepkg -fcrs --asdeps --noconfirm
fi
- mv src/${_srcname}/.config ${config_name}
+ mv src/${_srcname}/.processed-config ${config_name} || exit $?
done
- '
+ ' || exit $?
for config_name in ${config_names}; do
scp "arch32-test:${pkgname}/${config_name}" "${git_repo_path}/${repo}/${pkgname}/"
done