summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-03-13 20:04:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-15 01:53:05 +0000
commit1ceb13dda11645229053fc4840954333f8910ba4 (patch)
treea1f36ced6e78353e186ad80527e050926b82b0af
parent8a9a93369cbfbde5025ee789d03467a7af308a0e (diff)
downloadpoky-1ceb13dda11645229053fc4840954333f8910ba4.tar.gz
icecc: improve interaction with sstate
* exclude ICECC_PARALLEL_MAKE (like PARALLEL_MAKE is) * add ICECC_DISBLED to be able to disable whole icecc functionality while keeping icecc enabled. This is useful when you want multiple builders sharing same sstate-cache, but only some of them using icecc. * inheriting icecc changes all checksums because of do_*_prepends calls, but because icecc should not influence binary output of task we should get same checksums for tasks build with and without icecc * ICECC_DISABLED when set (to any non-empty value will disable icecc env modifications but while keeping same sstate checksum (From OE-Core rev: f46cf86d0ec3b80ce526b4dad1b1eac5995969ec) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/icecc.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index ae74050f6b..f3e89a9747 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -26,6 +26,8 @@
26#Error checking is kept to minimum so double check any parameters you pass to the class 26#Error checking is kept to minimum so double check any parameters you pass to the class
27########################################################################################### 27###########################################################################################
28 28
29BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED"
30
29ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" 31ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
30 32
31def icecc_dep_prepend(d): 33def icecc_dep_prepend(d):
@@ -160,6 +162,10 @@ def icc_get_tool(bb, d, tool):
160 return os.path.join(ice_dir, "%s-%s" % (target_sys, tool)) 162 return os.path.join(ice_dir, "%s-%s" % (target_sys, tool))
161 163
162set_icecc_env() { 164set_icecc_env() {
165 if [ "x${ICECC_DISABLED}" != "x" ]
166 then
167 return
168 fi
163 ICECC_VERSION="${@icc_version(bb, d)}" 169 ICECC_VERSION="${@icc_version(bb, d)}"
164 if [ "x${ICECC_VERSION}" = "x" ] 170 if [ "x${ICECC_VERSION}" = "x" ]
165 then 171 then