[coreboot-gerrit] New patch to review for coreboot: u-boot: Make sure targets aren't duplicated

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13767

-gerrit

commit 4aed215643cb8f2bfc95939df55366bb5b75ff06
Author: Martin Roth <martinroth at google.com>
Date:   Mon Feb 22 14:03:13 2016 -0800

    u-boot: Make sure targets aren't duplicated
    
    When U-Boot isn't selected as a payload, two of the targets:
    $(project_dir): and $(project_dir)/$(TAG-y) evaluated to the same
    value, generating a make warning when running a clean.  By adding
    additional text to the file that is created, this is avoided.
    
    Change-Id: I4b4df753612b674b3ccde2a757338840be92d1f2
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 payloads/external/U-Boot/Makefile.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/payloads/external/U-Boot/Makefile.inc b/payloads/external/U-Boot/Makefile.inc
index f0abee1..255db29 100644
--- a/payloads/external/U-Boot/Makefile.inc
+++ b/payloads/external/U-Boot/Makefile.inc
@@ -50,7 +50,7 @@ else
 	touch $(project_dir)/$(STABLE_COMMIT_ID)
 endif
 
-$(project_dir)/$(TAG-y): fetch
+$(project_dir)/tag-$(TAG-y): fetch
 	echo "    Checking out $(project_name) revision $(TAG-y)"
 	cd $(project_dir); git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
 
@@ -58,7 +58,7 @@ config: $(project_dir)/$(TAG-y)
 	rm -f $(project_config_file)
 ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),)
 ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","")
-	cat $(CONFIG_PAYLOAD_CONFIGFILE)" > $(project_config_file)
+	cat $(CONFIG_PAYLOAD_CONFIGFILE)" > tag-$(project_config_file)
 else
 	echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist"
 	false