From d43f10585a106b026849c8e6e793d8b57db5b29f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Thu, 4 Nov 2021 14:25:30 +0100 Subject: [PATCH 258/325] reproduce.sh: Attempt to unbreak the renaming of the release file directory Obtained from: ElectroBSD --- reproduce.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/reproduce.sh b/reproduce.sh index a0cc4bf7c0c7..5c22de8493ff 100755 --- a/reproduce.sh +++ b/reproduce.sh @@ -73,13 +73,20 @@ announce_status() { reproduce_all_the_things() { local \ - f release_dir + f release_dir objdir # In a perfect world the umask shouldn't matter here but # in the real world it does for the single file /etc/rc.local # on the memstick. umask 022 - release_dir="${MAKEOBJDIRPREFIX}${SRC_DIR}/release" + + objdir="$(make -V .OBJDIR)" + if [ -z "${objdir}" ]; then + announce_status "Failed to get .OBJDIR ..." + fi + release_dir="${objdir}/release" + announce_status "Using release dir ${release_dir} ..." + if "${RESUME_BUILD}"; then announce_status "Resuming ..." export KERNFAST=1 -- 2.32.0