Browse Source

prereq-build: add additional git detection

With some OS (Guix) the git submodule command is wrapped in
a script. Current logic parse the git submodule script directly.
If it's wrapped the prereq check wrongly fails while 'git submodule
--recursive' is actually available.
Add an additional check that try to directly use the 'git submodule'
command to check if the prereq is satisfied.

Fixes: #9986
Reported-by: Attila Lendvai <[email protected]>
Suggested-by: Attila Lendvai <[email protected]>
Signed-off-by: Christian 'Ansuel' Marangi <[email protected]>
Christian 'Ansuel' Marangi 3 years ago
parent
commit
ab1f3a8706
1 changed files with 2 additions and 1 deletions
  1. 2 1
      include/prereq-build.mk

+ 2 - 1
include/prereq-build.mk

@@ -177,7 +177,8 @@ $(eval $(call TestHostCommand,python3-distutils, \
 	$(STAGING_DIR_HOST)/bin/python3 -c 'import distutils'))
 
 $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
-	git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule))
+	git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule, \
+	git submodule --help | grep -- --recursive))
 
 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
 	file --version 2>&1 | grep file))