From a67363425cb035ca747f9c1945495fe568eb7e1d Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 5 Mar 2016 21:07:18 +0000 Subject: [PATCH] prereq: stop relying on man pages and grep for --recursive on the git-submodule script directly (fixes #21968) Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48934 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index a93dd63ab5..a53065576c 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -155,7 +155,7 @@ $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \ svn --version | grep Subversion)) $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \ - MANPAGER=cat git submodule --help 2>&1 | grep -q -- --recursive)) + git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule)) $(eval $(call SetupHostCommand,file,Please install the 'file' package, \ file --version 2>&1 | grep file)) -- 2.11.0