[coreboot-gerrit] New patch to review for coreboot: build system: don't try to add cbfs-files with no backing file
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Wed Nov 25 19:28:58 CET 2015
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12537
-gerrit
commit 6dd85ba5c7aa80ae908025a6304783f12a35fe97
Author: Patrick Georgi <pgeorgi at chromium.org>
Date: Wed Nov 25 18:59:54 2015 +0100
build system: don't try to add cbfs-files with no backing file
Change-Id: Idd05a552762be92d0d93b357b96442b25a614757
Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
Makefile.inc | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile.inc b/Makefile.inc
index 450a258..5851824 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -225,9 +225,11 @@ $(call add-special-class,cbfs-files)
cbfs-files-handler= \
$(eval tmp-cbfs-method:=$(word 2, $(subst :, ,$($(2)-file)))) \
$(eval $(2)-file:=$(call strip_quotes,$(word 1, $(subst :, ,$($(2)-file))))) \
- $(if $(wildcard $(1)$($(2)-file)), \
- $(eval tmp-cbfs-file:= $(wildcard $(1)$($(2)-file))), \
- $(eval tmp-cbfs-file:= $($(2)-file))) \
+ $(eval tmp-cbfs-file:= ) \
+ $(if $($(2)-file), \
+ $(if $(wildcard $(1)$($(2)-file)), \
+ $(eval tmp-cbfs-file:= $(wildcard $(1)$($(2)-file))), \
+ $(eval tmp-cbfs-file:= $($(2)-file)))) \
$(if $(strip $($(2)-required)), \
$(if $(wildcard $(tmp-cbfs-file)),, \
$(info This build configuration requires $($(2)-required)) \
@@ -247,7 +249,8 @@ cbfs-files-handler= \
$(eval tmp-old-cbfs-file:=$(tmp-cbfs-file)) \
$(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))) \
- $(eval cbfs-files-$(_cbfs-bucket) += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align))\
+ $(if $(tmp-cbfs-file), \
+ $(eval cbfs-files-$(_cbfs-bucket) += $(tmp-cbfs-file)|$(2)|$($(2)-type)|$($(2)-compression)|$(strip $($(2)-position))|$($(2)-align))) \
$(eval $(2)-name:=) \
$(eval $(2)-type:=) \
$(eval $(2)-compression:=) \
More information about the coreboot-gerrit
mailing list