merge build-packages

1 files changed, 9 insertions, 8 deletions

diff --git a/bin/build-packages b/bin/build-packages
index 9c69c5a..5203fc8 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -18,6 +18,15 @@
 # TODO: it might be worth trying to build with makedepends installed from
 # [testing] and only depends installed from [staging]
 
+# TODO: the following things need proper locking and/or proper handling of
+# external locks:
+# - `git` on the package source
+# - `archbuild` (e.g. /var/lib/archbuilds/staging-i686-build/root.lock)
+# - `find ... -exec umount` on the build chroot
+
+# TODO: releave some locking conditions - meta goal: be able to run multiple
+# build slaves on one host from within one archlinux32/builder repository
+
 # shellcheck disable=SC2016
 usage() {
   >&2 echo ''
@@ -533,14 +542,6 @@ while [ "${count}" -ne 0 ] && \
         find . -maxdepth 1 -type f \( -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig' \) -exec \
           rm {} \;
 
-        if echo "${outerParameters}" | \
-          grep -qwF -- '-c'; then
-          # sometimes it is necessary to manually remove the root/ build
-          # directory (due to leftover mounts of /run) - so we just do
-          # it everytime '-c' is set
-          recursively_umount_and_rm "${archbuild_chroots}/""${build_command%-build}"
-        fi
-
         echo 'building' > "${tmp_dir}/.ping-build-master"
         >&2 printf '%s: building package "%s" (revisions %s %s, repository %s, straw %s) for %s ...' \
           "$(date +'%Y-%m-%d %T')" \