From 8ee94a8ff1be0a0247521d6cc2a5a5b1bdc1b78f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Wed, 15 Feb 2017 15:56:42 -0500
Subject: makechrootpkg: _chrootbuild: Split into _chroot{prepare,build}.

---
 makechrootpkg.in | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index f90e20d..3c80fb7 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -311,6 +311,12 @@ EOF
 
 	# This is a little gross, but this way the script is recreated every time in the
 	# 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
@@ -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() {
@@ -478,6 +489,11 @@ download_sources "$copydir" "$src_owner"
 prepare_chroot "$copydir" "$USER_HOME" "$repack"
 
 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[@]}" \
-- 
cgit v1.2.3-54-g00ecf