summaryrefslogtreecommitdiff
path: root/src/chroot-tools/libremakepkg
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-07-19 17:06:58 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2021-07-26 19:20:09 -0400
commitf852d5876b8c0be70e3686efd4f0a005dbb53648 (patch)
treedc8bb4b038d041f09d166360ecd2517a88713c45 /src/chroot-tools/libremakepkg
parentc64c8ddcdfcce76f41f7c37cccec8d4894ade2c1 (diff)
wip - multiple concernswip-2021-03
Diffstat (limited to 'src/chroot-tools/libremakepkg')
-rwxr-xr-xsrc/chroot-tools/libremakepkg13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index 3718166..945b8ae 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -110,6 +110,8 @@ chroot_cleanup() {
}
build() (
+DBG "libremakepkg::build() IN"
+
local copydir=$1
local srcpkg=$2
local repack=$3
@@ -134,11 +136,17 @@ build() (
fi
$NONET || run_nnet=("${run_ynet[@]}")
- prepare_chroot "$copydir" "$LIBREHOME" "$repack" false
+DBG "libremakepkg::build() prepare_chroot"
+
+ prepare_chroot "$copydir" "$LIBREHOME" "$repack" false # generates 'chrootbuild'
+
+DBG "libremakepkg::build() pre_build run_nnet=${run_nnet[*]}"
run_hook pre_build "$copydir"
trap "run_hook post_build ${copydir@Q}; rm -rf -- ${startdir@Q}" EXIT
- "${run_nnet[@]}" /chrootbuild "${makepkg_args[@]}" </dev/null |& indent
+ "${run_nnet[@]}" /chrootbuild "${makepkg_args[@]}" < /dev/null |& indent
+
+DBG "libremakepkg::build() OUT"
)
# The main program #############################################################
@@ -299,6 +307,7 @@ main() {
msg 'Initializing the chroot...'
librechroot "${librechroot_flags[@]}" make |& indent
fi
+DBG "libremakepkg::main() GUARD whoami=$(whoami) id=$(id)" ; return 1
# Set target CARCH
# note that we waited until after locking/creating the chroot to do this