[openwrt/openwrt] prereq: SetupHostCommand: fix wrong check result

LEDE Commits lede-commits at lists.infradead.org
Tue May 23 12:42:52 PDT 2023


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/56ffc5a86676b105e806734e722f581f8ccb2a2a

commit 56ffc5a86676b105e806734e722f581f8ccb2a2a
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Tue May 23 14:17:47 2023 +0200

    prereq: SetupHostCommand: fix wrong check result
    
    Tony has reported, that CI tools job is failing for him in macOS
    container due to prereq check failure for GNU `install` utility.
    
    Michael diagnosed it and from his traces it was clear, that the issue is
    caused by a wrong return value in the success check case, so lets fix it
    accordingly.
    
    Fixes: f75204036ccc ("prereq-build: allow host command symlinks to update")
    Reported-by: Tony Ambardar <itugrok at yahoo.com>
    Diagnosed-by: Michael Pratt <mcpratt at pm.me>
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    (cherry picked from commit 7855378fcd7ed7cb0a223238a99bac0b8e46c380)
---
 include/prereq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/prereq.mk b/include/prereq.mk
index 5646b24efa..74c3914d06 100644
--- a/include/prereq.mk
+++ b/include/prereq.mk
@@ -113,7 +113,7 @@ define SetupHostCommand
 						;; \
 				esac; \
 				ln -sf "$$$$$$$$bin" "$(STAGING_DIR_HOST)/bin/$(strip $(1))"; \
-				exit 1; \
+				exit 0; \
 			fi; \
 		fi; \
 	done; \




More information about the lede-commits mailing list