From 43ebbacdc47fd650c8b0f40c4190ed49ec619a64 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 8 Jun 2023 15:40:41 +0200 Subject: added ${repository} to build_commands (staging-xxx), for newer devtools32 --- bin/build-packages | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/build-packages b/bin/build-packages index a5cd235..461937b 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -21,7 +21,7 @@ # 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) +# - `archbuild` (e.g. /var/lib/archbuilds/${repository}-staging-i686-build/root.lock) # - `find ... -exec umount` on the build chroot # TODO: releave some locking conditions - meta goal: be able to run multiple @@ -411,7 +411,7 @@ while [ "${count}" -ne 0 ] && \ if echo "${straw}" | \ grep -qF ':with_build_support:'; then - build_command='staging-with-build-support-'"${arch}"'-build' + build_command="${repository}-staging-with-build-support-${arch}-build" elif echo "${straw}" | \ grep -qF ':without_systemd_nspawn:'; then if [ -z "${prefered_package}" ]; then @@ -469,9 +469,9 @@ while [ "${count}" -ne 0 ] && \ >&2 printf 'Can only build "any" packages with :on_x86_64:, but got a "%s" package.\n' "${arch}" exit 2 fi - build_command='staging-x86_64-build' + build_command="${repository}-staging-x86_64-build" else - build_command='staging-'"${arch}"'-build' + build_command="${repository}-staging-'${arch}'-build" fi find . -maxdepth 1 -type f \( \ -- cgit v1.2.3-70-g09d2