From e7e772d55ce18171e6c2005d27ecc0b9b486942b Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 22 Jan 2024 14:29:03 +0100 Subject: [PATCH] fix IGNORE_SUBMODULES filter --- App/tools/driver.makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index 64421db..f14588a 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -151,7 +151,7 @@ $(foreach v,$(sort $(basename $(basename $(basename ${BUILD_EPICS_VERSIONS}))) $ # Checkout all git submodules except hidden ones like ".ci" which we most likely don't need # User can extend or overwrite IGNORE_SUBMODULES IGNORE_SUBMODULES = .% -SUBMODULES:=$(filter-out ${IGNORE_SUBMODULES},$(foreach f,$(wildcard .gitmodules),$(shell awk '/^\[submodule/ { print gensub(/["\]]/,"","g",$$2) }' $f))) +SUBMODULES=$(filter-out ${IGNORE_SUBMODULES},$(foreach f,$(wildcard .gitmodules),$(shell awk '/^\[submodule/ { print gensub(/["\]]/,"","g",$$2) }' $f))) # Check only version of files needed to build the module. But which are they? VERSIONCHECKFILES = $(filter-out /% -none-, $(USERMAKEFILE) $(wildcard *.db *.template *.subs *.dbd *.cmd *.iocsh) ${SOURCES} ${DBDS} ${TEMPLATES} ${SCRIPTS} $($(filter SOURCES_% DBDS_%,${.VARIABLES}))) @@ -260,11 +260,9 @@ what:: prebuild: ${IGNOREFILES} -ifneq ($(SUBMODULES),) prebuild: submodules submodules: - git submodule update --init --recursive -endif + $(if $(SUBMODULES),git submodule update --init --recursive $(SUBMODULES)) # Loop over all EPICS versions for second run. # Clear EPICS_SITE_VERSION to get rid of git warnings with some base installations