summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-02-19 16:30:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-24 10:31:47 +0000
commitb803bbcad28ecb56895d49cc8e4525796ddc7f8b (patch)
treea2f9b6aeccb88d294d4c8089b33f79ab3974aaf2
parentdbf9346eaf7b8614b855b4c48ac0e925c9a3f704 (diff)
downloadpoky-b803bbcad28ecb56895d49cc8e4525796ddc7f8b.tar.gz
icecc.bbclass: Add environment version
Adds a version to the environment which can be used to invalidate any previous environments on the remote compile nodes (From OE-Core rev: 9bda79af100293ea3cb986dd501e0be028f2f04c) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/icecc.bbclass15
1 files changed, 14 insertions, 1 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 2bf6cdb003..bfab61dfa3 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -34,6 +34,15 @@ BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_
34 34
35ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" 35ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
36 36
37# This version can be incremented when changes are made to the environment that
38# invalidate the version on the compile nodes. Changing it will cause a new
39# environment to be created.
40#
41# A useful thing to do for testing Icecream changes locally is to add a
42# subversion in local.conf:
43# ICECC_ENV_VERSION_append = "-my-ver-1"
44ICECC_ENV_VERSION = "1"
45
37# Default to disabling the caret workaround, If set to "1" in local.conf, icecc 46# Default to disabling the caret workaround, If set to "1" in local.conf, icecc
38# will locally recompile any files that have warnings, which can adversely 47# will locally recompile any files that have warnings, which can adversely
39# affect performance. 48# affect performance.
@@ -203,7 +212,11 @@ def icecc_version(bb, d):
203 212
204 import socket 213 import socket
205 ice_dir = icecc_dir(bb, d) 214 ice_dir = icecc_dir(bb, d)
206 tar_file = os.path.join(ice_dir, archive_name + "-@VERSION@-" + socket.gethostname() + '.tar.gz') 215 tar_file = os.path.join(ice_dir, "{archive}-{version}-@VERSION@-{hostname}.tar.gz".format(
216 archive=archive_name,
217 version=d.getVar('ICECC_ENV_VERSION', True),
218 hostname=socket.gethostname()
219 ))
207 220
208 return tar_file 221 return tar_file
209 222