summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-11-26 17:17:28 +0100
committerPatrick Georgi <pgeorgi@google.com>2015-12-02 17:30:31 +0100
commit67cb6aa6a779ad3d021570385e61308d333c116d (patch)
treef42f525130d777937539ad26edcc3529c795b33f
parent99ae578b43012e2b19b82cc31c7f6585efe6a3fd (diff)
downloadcoreboot-67cb6aa6a779ad3d021570385e61308d333c116d.tar.xz
build system: make cbfs-files mechanism spaces-safe
Space is commonly used as separator in make variables, so escape them as * (which should be reasonably uncommon in file names and cbfstool options alike to not be a problem). Change-Id: Ia77b5559841b5eae3aa1c0c0027f2e7fb882ea2f Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: https://review.coreboot.org/12548 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--Makefile.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 23617358bc..e42bbee92f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -269,7 +269,7 @@ cbfs-files-handler= \
$(eval tmp-cbfs-file:=$(shell mkdir -p $(obj)/mainboard/$(MAINBOARDDIR); mktemp $(obj)/mainboard/$(MAINBOARDDIR)/cbfs-file.XXXXXX).out) \
$(call cbfs-files-processor-$(tmp-cbfs-method),$(tmp-old-cbfs-file),$(tmp-cbfs-file))) \
$(if $(tmp-cbfs-file), \
- $(eval cbfs-files-$(_cbfs-bucket) += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align)|$($(2)-options))) \
+ $(eval cbfs-files-$(_cbfs-bucket) += $(subst $(spc),*,$(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align)|$($(2)-options)))) \
$(eval $(2)-name:=) \
$(eval $(2)-type:=) \
$(eval $(2)-compression:=) \
@@ -598,7 +598,7 @@ $(objcbfs)/%.elf: $(objcbfs)/%.debug
COREBOOT_ROM_DEPENDENCIES:=
-extract_nth=$(patsubst -%-,%,$(word $(1), $(subst |,- -,-$(2)-)))
+extract_nth=$(subst *,$(spc),$(patsubst -%-,%,$(word $(1), $(subst |,- -,-$(2)-))))
cbfs-add-cmd = \
$(CBFSTOOL) $@.tmp \