Skip to contentSkip to conversation

icecc: improve interaction with sstate

PATCH New Martin Jansa 1 participant 1 message Mar 13, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 meta/classes/icecc.bbclass | 6 ++++++
 1 file changed, 6 insertions(+)
meta/classes/icecc.bbclass +6 -0
index ae74050..f3e89a9 100644
@@ -26,6 +26,8 @@
 #Error checking is kept to minimum so double check any parameters you pass to the class
 ###########################################################################################
 
+BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED"
+
 ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
 
 def icecc_dep_prepend(d):
@@ -160,6 +162,10 @@ def icc_get_tool(bb, d, tool):
         return os.path.join(ice_dir, "%s-%s" % (target_sys, tool))
 
 set_icecc_env() {
+    if [ "x${ICECC_DISABLED}" != "x" ]
+    then
+        return
+    fi
     ICECC_VERSION="${@icc_version(bb, d)}"
     if [ "x${ICECC_VERSION}" = "x" ]
     then
Signature · 1 line
1.8.1.5