build: allow EXCLUDE_COMPONENTS to contain quotes

'dequote' macro can’t be used at this point yet, use subst directly.
Also prevent EXCLUDE_COMPONENTS from being passed to bootloader build.

diff --git a/components/bootloader/Makefile.projbuild b/components/bootloader/Makefile.projbuild
index 7876635cc96d8047d0363d8610d8dc31317a2f5c..1d569bab3c46d85a56528a086f6cb4bd1aeadf30 100644 (file)
--- a/components/bootloader/Makefile.projbuild
+++ b/components/bootloader/Makefile.projbuild
@@ -32,7 +32,8 @@ BOOTLOADER_MAKE= +\
        V=$(V) \
        BUILD_DIR_BASE=$(BOOTLOADER_BUILD_DIR) \
        TEST_COMPONENTS= \
-       TESTS_ALL=
+       TESTS_ALL= \
+       EXCLUDE_COMPONENTS=
 
 .PHONY: bootloader-clean bootloader-flash bootloader-list-components bootloader $(BOOTLOADER_BIN)
 

diff --git a/make/project.mk b/make/project.mk
index 01b29bcb38abfc62fc791388915090a2e6243b12..636e46fc3b273c3d0c9f9e47af2f8eae710a11b1 100644 (file)
--- a/make/project.mk
+++ b/make/project.mk
@@ -153,7 +153,8 @@ COMPONENTS := $(sort $(foreach comp,$(COMPONENTS),$(lastword $(subst /, ,$(comp)
 endif
 # After a full manifest of component names is determined, subtract the ones explicitly omitted by the project Makefile.
 ifdef EXCLUDE_COMPONENTS
-COMPONENTS := $(filter-out $(EXCLUDE_COMPONENTS), $(COMPONENTS))
+COMPONENTS := $(filter-out $(subst ",,$(EXCLUDE_COMPONENTS)), $(COMPONENTS)) 
+# to keep syntax highlighters happy: "))
 endif
 export COMPONENTS