summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-10-03 12:44:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-10-03 12:46:18 +0000
commit324a57592e5e8f0196bb1bd082c278d82673af8c (patch)
tree5e1f6954d15902df512ea093d44559fd29edf40d
parent0bf61ee06a6c91695111202650a440297c405e2d (diff)
downloadabuild-324a57592e5e8f0196bb1bd082c278d82673af8c.tar.bz2
abuild-324a57592e5e8f0196bb1bd082c278d82673af8c.tar.xz
abuild: run build actions via runpart
So we make sure chdir $builddir happens when it should.
-rw-r--r--abuild.in16
1 files changed, 5 insertions, 11 deletions
diff --git a/abuild.in b/abuild.in
index 697af2a..42382e5 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1508,7 +1508,7 @@ create_apks() {
}
build_abuildrepo() {
- local _check=check
+ local part _check=check
if options_has "checkroot"; then
_check=check_fakeroot
fi
@@ -1520,16 +1520,10 @@ build_abuildrepo() {
abuild-sign --installed
logcmd "building $repo/$pkgname-$pkgver-r$pkgrel"
msg "Building $repo/$pkgname $pkgver-r$pkgrel (using $program $program_version)"
- sanitycheck
- builddeps
- clean
- fetch
- unpack
- prepare
- mkusers
- build
- $_check
- rootpkg
+ for part in sanitycheck builddeps clean fetch unpack prepare mkusers build \
+ $_check rootpkg; do
+ runpart $part
+ done
cleanup $CLEANUP
fi
update_abuildrepo_index