From: Michael Pratt Date: Thu, 25 May 2023 07:00:57 +0000 (-0400) Subject: Revert "prereq: SetupHostCommand: fix wrong check result" X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9ffd6013b918145295d12ef15ca4282f48ce49e5;p=openwrt%2Fstaging%2Fnbd.git Revert "prereq: SetupHostCommand: fix wrong check result" This reverts commit 7855378fcd7ed7cb0a223238a99bac0b8e46c380. The return "exit 1" was intentional and actually just makes the symlink checks much more strict. This new level of strictness added to the checks revealed what was a confusing regression with prereq stage that already existed but was not presenting itself because of the simple way that checks used to be done before. Either way, reverting to "exit 0" was a nice workaround until the true root cause was discovered, so as to not interfere with others' pull requests and builds in the meantime. It turns out that this problem was the inconsistent value of $PATH between different commands within the SetupHostCommand recipe, now fixed in the parent commit, using the variable created in the parent of the parent commit. Ref: f75204036c ("prereq-build: allow host command symlinks to update") Signed-off-by: Michael Pratt --- diff --git a/include/prereq.mk b/include/prereq.mk index 45c84e984c..c72878ebb0 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -112,7 +112,7 @@ define SetupHostCommand ;; \ esac; \ ln -sf "$$$$$$$$bin" "$(STAGING_DIR_HOST)/bin/$(strip $(1))"; \ - exit 0; \ + exit 1; \ fi; \ fi; \ done; \