Werner Zeh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35786 )
Change subject: Revert "site-local: Allow to read Makefile.inc w/o .config" ......................................................................
Revert "site-local: Allow to read Makefile.inc w/o .config"
This reverts commit 275f2e22a1a441d48a12bfe39ef3ce960efd7a04. Since in this commit the inclusion of site-local/Makefile.inc was moved outside of the guard 'ifeq ($(NOCOMPILE),1)', this Makefile.inc will be included always here (what seems to be the intention of this commit).
As we have a second place where site-local/Makefile.inc is included (top-level Makefile.inc via subdirs-y class) this unconditional include leads to a double included site-local/Makefile.inc. Therefore one will get errors if a separate rule is used in site-local/Makefile.inc.
Change-Id: I0a693c1d793b978c8023e4f107dce139d537d8db Signed-off-by: Werner Zeh werner.zeh@siemens.com --- M Makefile 1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/35786/1
diff --git a/Makefile b/Makefile index 35a4b32..14ec2bf 100644 --- a/Makefile +++ b/Makefile @@ -144,12 +144,11 @@ \mv -f $@.tmp $@ 2> /dev/null rm -f $@.tmp
--include $(TOPLEVEL)/site-local/Makefile.inc - ifeq ($(NOCOMPILE),1) include $(TOPLEVEL)/Makefile.inc include $(TOPLEVEL)/payloads/Makefile.inc include $(TOPLEVEL)/util/testing/Makefile.inc +-include $(TOPLEVEL)/site-local/Makefile.inc real-all: @echo "Error: Expected config file ($(DOTCONFIG)) not present." >&2 @echo "Please specify a config file or run 'make menuconfig' to" >&2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35786 )
Change subject: Revert "site-local: Allow to read Makefile.inc w/o .config" ......................................................................
Patch Set 1: Code-Review+1
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35786 )
Change subject: Revert "site-local: Allow to read Makefile.inc w/o .config" ......................................................................
Patch Set 1: Code-Review+2
Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35786 )
Change subject: Revert "site-local: Allow to read Makefile.inc w/o .config" ......................................................................
Revert "site-local: Allow to read Makefile.inc w/o .config"
This reverts commit 275f2e22a1a441d48a12bfe39ef3ce960efd7a04. Since in this commit the inclusion of site-local/Makefile.inc was moved outside of the guard 'ifeq ($(NOCOMPILE),1)', this Makefile.inc will be included always here (what seems to be the intention of this commit).
As we have a second place where site-local/Makefile.inc is included (top-level Makefile.inc via subdirs-y class) this unconditional include leads to a double included site-local/Makefile.inc. Therefore one will get errors if a separate rule is used in site-local/Makefile.inc.
Change-Id: I0a693c1d793b978c8023e4f107dce139d537d8db Signed-off-by: Werner Zeh werner.zeh@siemens.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35786 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M Makefile 1 file changed, 1 insertion(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve
diff --git a/Makefile b/Makefile index 35a4b32..14ec2bf 100644 --- a/Makefile +++ b/Makefile @@ -144,12 +144,11 @@ \mv -f $@.tmp $@ 2> /dev/null rm -f $@.tmp
--include $(TOPLEVEL)/site-local/Makefile.inc - ifeq ($(NOCOMPILE),1) include $(TOPLEVEL)/Makefile.inc include $(TOPLEVEL)/payloads/Makefile.inc include $(TOPLEVEL)/util/testing/Makefile.inc +-include $(TOPLEVEL)/site-local/Makefile.inc real-all: @echo "Error: Expected config file ($(DOTCONFIG)) not present." >&2 @echo "Please specify a config file or run 'make menuconfig' to" >&2
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)
-
Werner Zeh (Code Review)