diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-03-05 21:07:18 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-03-05 21:07:18 +0000 |
| commit | 415dbcb917a481af5d97faa2dc431ec073bed705 (patch) | |
| tree | e5a32858e6d4c0a58463ee549dce29174cf8ddcf /include | |
| parent | 268d380182ff34b9b049988c3a1947011e7c365b (diff) | |
| download | master-187ad058-415dbcb917a481af5d97faa2dc431ec073bed705.tar.gz master-187ad058-415dbcb917a481af5d97faa2dc431ec073bed705.tar.bz2 master-187ad058-415dbcb917a481af5d97faa2dc431ec073bed705.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48934 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/prereq-build.mk | 2 |
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)) |