aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-03-05 21:07:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-03-05 21:07:18 +0000
commit4c80909fa141fe2921c62bd17b2b04153031df18 (patch)
treeb076add8acade6987585e6b4a84ba5605eb40d23
parente9d7ee4f4149e4469d49cd7bf1af532cb114e04f (diff)
downloadupstream-4c80909fa141fe2921c62bd17b2b04153031df18.tar.gz
upstream-4c80909fa141fe2921c62bd17b2b04153031df18.tar.bz2
upstream-4c80909fa141fe2921c62bd17b2b04153031df18.zip
prereq: stop relying on man pages and grep for --recursive on the git-submodule script directly (fixes #21968)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48934
-rw-r--r--include/prereq-build.mk2
1 files changed, 1 insertions, 1 deletions
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))