From 903f0605f352c8de7d47bc7e74768eaf44157ebe Mon Sep 17 00:00:00 2001 From: Jeong Han Lee <jeonghan.lee@gmail.com> Date: Tue, 22 May 2018 13:49:31 +0200 Subject: [PATCH] use the simple version of git update --- configure/E3/DEFINES_FT | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure/E3/DEFINES_FT b/configure/E3/DEFINES_FT index 9b18488..ca847f8 100644 --- a/configure/E3/DEFINES_FT +++ b/configure/E3/DEFINES_FT @@ -1,5 +1,5 @@ # Keep always the module up-to-date -define git_update = +define git_module_init_update = git submodule deinit -f $@/ sed -i '/submodule/,24465d' $(TOP)/.git/config rm -rf $(TOP)/.git/modules/$@ @@ -8,6 +8,11 @@ git submodule update --init --recursive $@/. git submodule update --remote --merge $@/ endef +define git_update = +git submodule update --init --recursive $@/. +git submodule update --remote --merge $@/ +endef + define patch_site for i in $(wildcard $(TOP)/patch/Site/*p0.patch); do\ printf "\nPatching %s with the file : %s\n" "$(E3_MODULE_SRC_PATH)" "$$i"; \ @@ -36,6 +41,7 @@ endif ### Exclude the following variables to display VARS_EXCLUDES+=git_update +VARS_EXCLUDES+=git_module_init_update VARS_EXCLUDES+=patch_site VARS_EXCLUDES+=patch_revert_site VARS_EXCLUDES+=QUIET -- GitLab