[openwrt/openwrt] prereq: make existing binary check work for sdk as well

LEDE Commits lede-commits at lists.infradead.org
Thu Oct 26 16:04:33 PDT 2023


jow pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/9eec4eb2684531ef146b9e4ff1a6c7545302fca9

commit 9eec4eb2684531ef146b9e4ff1a6c7545302fca9
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Wed Aug 16 11:22:30 2023 +0200

    prereq: make existing binary check work for sdk as well
    
    To avoid replacing host built binaries with symlinks again, a check for
    an appropriate stamp was added in 729909c07f ("prereq-build: do not
    replace binaries with symlinks"). Unfortunately the stamp directory does
    not exist in the SDK, so the fix was ineffective there.
    
    This caused the packages builders to e.g. use the host tar again, which
    in turn made the tarballs created different since it may lack
    reproducibility fixes, or implement these differently, causing spurious
    hash failures on source repository based packages.
    
    Fix this by dropping the stamp dir check, and just check that the file
    is usable.
    
    Fixes: 729909c07f ("prereq-build: do not replace binaries with symlinks")
    Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
    (cherry picked from commit c1ef10c8d873254ce7c1f3019d821c4a87227474)
---
 include/prereq.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/prereq.mk b/include/prereq.mk
index 88ed1f406a..5cb1102182 100644
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -111,7 +111,6 @@ define SetupHostCommand
 						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
 						;; \
 					"-"*) \
-						find "$(STAGING_DIR_HOST)/stamp" | grep $(strip $(1)) && \
 						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
 						;; \
 					*" -> /"*) \




More information about the lede-commits mailing list