makechrootpkg: _chrootbuild: Split into _chroot{prepare,build}.

1 files changed, 17 insertions, 1 deletions

diff --git a/makechrootpkg.in b/makechrootpkg.in
index f90e20d..3c80fb7 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -313,6 +313,12 @@ EOF
 	# working copy
 	{
 		printf '#!/bin/bash\n'
+		declare -f _chrootprepare
+		printf '_chrootprepare "$@"\n'
+	} > "$copydir/chrootprepare"
+	chmod +x "$copydir/chrootprepare"
+	{
+		printf '#!/bin/bash\n'
 		declare -f _chrootbuild
 		printf '_chrootbuild "$@" || exit\n'
 
@@ -326,9 +332,14 @@ EOF
 
 # These functions aren't run in makechrootpkg,
 # so no global variables
+_chrootprepare() {
+	. /etc/profile
+	sudo -iu builduser bash -c 'cd /startdir; makepkg "$@" --nobuild' -bash "$@"
+}
+
 _chrootbuild() {
 	. /etc/profile
-	sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+	sudo -iu builduser bash -c 'cd /startdir; makepkg "$@" --noextract --noprepare' -bash "$@"
 }
 
 _chrootnamcap() {
@@ -481,6 +492,11 @@ if arch-nspawn "$copydir" \
 	--bind="$PWD:/startdir" \
 	--bind="$SRCDEST:/srcdest" \
 	"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
+	/chrootprepare "${makepkg_args[@]}" &&
+   arch-nspawn "$copydir" \
+	--bind="$PWD:/startdir" \
+	--bind="$SRCDEST:/srcdest" \
+	"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
 	/chrootbuild "${makepkg_args[@]}"
 then
 	move_products "$copydir" "$src_owner"