From fd2f3136ca5134364af7bfaf574379c1dbda8344 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Thu, 23 Sep 2021 15:30:32 -1000 Subject: [PATCH] build: do not require git/rsync for ImageBuilder The ImageBuilder does not need git or rsync since it only glues files together, packages are downloaded via wget and not rsync. Signed-off-by: Paul Spooren [ solve conflict with additional git prereq test ] Signed-off-by: Christian Marangi --- include/prereq-build.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 80d549af39..7428c21e16 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -53,6 +53,13 @@ $(eval $(call TestHostCommand,ncurses, \ Please install ncurses. (Missing libncurses.so or ncurses.h), \ echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \ gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses)) + +$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \ + git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule, \ + git submodule --help | grep -- --recursive)) + +$(eval $(call SetupHostCommand,rsync,Please install 'rsync', \ + rsync --version = 1.7.12.2, \ - 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)) -$(eval $(call SetupHostCommand,rsync,Please install 'rsync', \ - rsync --version