Change in coreboot[master]: Makefile.inc: Use `define` for cbfs-files-processor-defconfig
Hello Patrick Georgi,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/38793
to review the following change.
Change subject: Makefile.inc: Use `define` for cbfs-files-processor-defconfig ......................................................................
Makefile.inc: Use `define` for cbfs-files-processor-defconfig
The body contains a `#` and GNU make 4.3 disagrees with earlier versions if it should be treated as a comment. Turn it into a `define` which has clearer semantics regarding comments (interpretation is supposed to be deferred until the variable is expanded).
Change-Id: I589542abbd14082c3ecc4a2456ebd809fb6911ea Signed-off-by: Nico Huber nico.h@gmx.de --- M Makefile.inc 1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/38793/1
diff --git a/Makefile.inc b/Makefile.inc index 7b4dcb3..64faa82 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -307,15 +307,16 @@ # Reduce a .config file to its minimal representation # arg1: input # arg2: output -cbfs-files-processor-defconfig= \ +define cbfs-files-processor-defconfig $(eval $(2): $(1) $(obj)/build.h $(objutil)/kconfig/conf; \ +printf " CREATE $(2) (from $(1))\n"; \ - printf "# This image was built using coreboot " > $(2).tmp && \ + printf "# This image was built using coreboot " > $(2).tmp && \ grep "<COREBOOT_VERSION>" $(obj)/build.h |cut -d" -f2 >> $(2).tmp && \ $(MAKE) DOTCONFIG=$(1) DEFCONFIG=$(2).tmp2 savedefconfig && \ cat $(2).tmp2 >> $(2).tmp && \ rm -f $(2).tmp2 && \ \mv -f $(2).tmp $(2)) +endef
####################################################################### # Compile a C file with a bare struct definition into binary
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38793 )
Change subject: Makefile.inc: Use `define` for cbfs-files-processor-defconfig ......................................................................
Patch Set 1: Code-Review+1
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38793 )
Change subject: Makefile.inc: Use `define` for cbfs-files-processor-defconfig ......................................................................
Patch Set 1: Code-Review+1
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38793 )
Change subject: Makefile.inc: Use `define` for cbfs-files-processor-defconfig ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38793 )
Change subject: Makefile.inc: Use `define` for cbfs-files-processor-defconfig ......................................................................
Makefile.inc: Use `define` for cbfs-files-processor-defconfig
The body contains a `#` and GNU make 4.3 disagrees with earlier versions if it should be treated as a comment. Turn it into a `define` which has clearer semantics regarding comments (interpretation is supposed to be deferred until the variable is expanded).
Change-Id: I589542abbd14082c3ecc4a2456ebd809fb6911ea Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/38793 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M Makefile.inc 1 file changed, 3 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve Angel Pons: Looks good to me, but someone else must approve
diff --git a/Makefile.inc b/Makefile.inc index 2690e8f..648bc4f 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -316,15 +316,16 @@ # Reduce a .config file to its minimal representation # arg1: input # arg2: output -cbfs-files-processor-defconfig= \ +define cbfs-files-processor-defconfig $(eval $(2): $(1) $(obj)/build.h $(objutil)/kconfig/conf; \ +printf " CREATE $(2) (from $(1))\n"; \ - printf "# This image was built using coreboot " > $(2).tmp && \ + printf "# This image was built using coreboot " > $(2).tmp && \ grep "<COREBOOT_VERSION>" $(obj)/build.h |cut -d" -f2 >> $(2).tmp && \ $(MAKE) DOTCONFIG=$(1) DEFCONFIG=$(2).tmp2 savedefconfig && \ cat $(2).tmp2 >> $(2).tmp && \ rm -f $(2).tmp2 && \ \mv -f $(2).tmp $(2)) +endef
####################################################################### # Compile a C file with a bare struct definition into binary
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38793 )
Change subject: Makefile.inc: Use `define` for cbfs-files-processor-defconfig ......................................................................
Patch Set 2:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/562 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/561 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/560
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Angel Pons (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)