[coreboot-gerrit] Patch set updated for coreboot: build system: make cbfs-files mechanism spaces-safe

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12548

-gerrit

commit 5ea8c7c840e56b0e45e20b67d3c34c4b6dc1925d
Author: Patrick Georgi 
Date:   Thu Nov 26 17:17:28 2015 +0100

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 
---
 Makefile.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 09cd6cc..82e7bdb 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -265,7 +265,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:=) \
@@ -594,7 +594,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 \