diff options
| author |   Joshua Watt <jpewhacker@gmail.com> | 2018-02-19 16:30:21 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:35 +0000 |
| commit | 9bda79af100293ea3cb986dd501e0be028f2f04c (patch) | |
| tree | 413ffd6a359b283884b0b0ed503aa1db6cef2801 | |
| parent | 09ba173f56dcd7299a07d4dac3633fe7818f7282 (diff) | |
| download | openembedded-core-contrib-9bda79af100293ea3cb986dd501e0be028f2f04c.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
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/icecc.bbclass | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 2bf6cdb003d..bfab61dfa36 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_ ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" +# This version can be incremented when changes are made to the environment that +# invalidate the version on the compile nodes. Changing it will cause a new +# environment to be created. +# +# A useful thing to do for testing Icecream changes locally is to add a +# subversion in local.conf: +# ICECC_ENV_VERSION_append = "-my-ver-1" +ICECC_ENV_VERSION = "1" + # Default to disabling the caret workaround, If set to "1" in local.conf, icecc # will locally recompile any files that have warnings, which can adversely # affect performance. @@ -203,7 +212,11 @@ def icecc_version(bb, d): import socket ice_dir = icecc_dir(bb, d) - tar_file = os.path.join(ice_dir, archive_name + "-@VERSION@-" + socket.gethostname() + '.tar.gz') + tar_file = os.path.join(ice_dir, "{archive}-{version}-@VERSION@-{hostname}.tar.gz".format( + archive=archive_name, + version=d.getVar('ICECC_ENV_VERSION', True), + hostname=socket.gethostname() + )) return tar_file |