[coreboot-gerrit] Change in coreboot[master]: Makefile.inc: Move shared abuild options into a variable

[Martin Roth (Code Review)]

Martin Roth has uploaded a new change for review. ( https://review.coreboot.org/19070 )

Change subject: Makefile.inc: Move shared abuild options into a variable
......................................................................

Makefile.inc: Move shared abuild options into a variable

With 4 calls to abuild, move the common command line parameters into
a variable that can be shared between all of the invocations.

Change-Id: I5cdf2f343bd28424b7cc1dfc6ca132a9fb9e6554
Signed-off-by: Martin Roth <gaumless at gmail.com>
---
M Makefile.inc
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/19070/1

diff --git a/Makefile.inc b/Makefile.inc
index c8660b6..14c9537 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1053,10 +1053,11 @@
 	viatool
 JENKINS_PAYLOAD?=none
 CPUS?=4
+JENKINS_ABUILD_OPTIONS=-B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) --timeless
 what-jenkins-does:
 	util/lint/lint lint-stable --junit
-	util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml --timeless --checksum $(top)/checksums_chromeos
-	util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) --timeless --checksum $(top)/checksums
+	util/abuild/abuild $(JENKINS_ABUILD_OPTIONS) -x -X $(top)/abuild-chromeos.xml --checksum $(top)/checksums_chromeos
+	util/abuild/abuild $(JENKINS_ABUILD_OPTIONS) --checksum $(top)/checksums
 	(cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml)
 	$(foreach tool, $(TOOLLIST), $(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=util/ BLD="$(tool)" MFLAGS= MAKEFLAGS= MAKETARGET= junit.xml; )
 	$(MAKE) CPUS=$(CPUS) V=$(V) Q=$(Q) BLD_DIR=payloads/ BLD=nvramcui MFLAGS= MAKEFLAGS= MAKETARGET=all junit.xml
@@ -1071,8 +1072,8 @@
 	fi
 	echo "********** BUILDING PARENT COMMIT **********"
 	$(GIT) checkout HEAD^
-	util/abuild/abuild -B $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x --timeless --checksum $(top)/checksums_chromeos
-	util/abuild/abuild -B $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) --timeless --checksum $(top)/checksums
+	util/abuild/abuild $(JENKINS_ABUILD_OPTIONS) -x --checksum $(top)/checksums_chromeos
+	util/abuild/abuild $(JENKINS_ABUILD_OPTIONS) --checksum $(top)/checksums
 	$(GIT) checkout $(GITCOMMIT)
 	echo "********** Finished Building Parent Commit **********"
 	DIFFS="$$(sort $(top)/checksums_chromeos_platform | uniq -c | grep -v '^ *2 ' | sed 's/.*coreboot-/coreboot-/' | sort | uniq; \

-- 
To view, visit https://review.coreboot.org/19070
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cdf2f343bd28424b7cc1dfc6ca132a9fb9e6554
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Martin Roth <martinroth at google.com>