From 324a57592e5e8f0196bb1bd082c278d82673af8c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 3 Oct 2018 12:44:56 +0000
Subject: [PATCH] abuild: run build actions via runpart

So we make sure chdir $builddir happens when it should.
---
 abuild.in | 16 +++++-----------
 1 file 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