sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

icecc: don't create unnecessary 'ice' dirs in sysroots when disabled 

* parsing ICE_PATH="${@icc_path(bb, d)}" causes "ice" directories
  to be created in every sysroot, that could be a bit confusing for
  people who inherit icecc.bbclass, but disabled it
* shorten ICECC_VERSION="${@icc_version(bb, d)}" path a bit
  by returning sooner when disabled
* remove ICECC_PATH and ICECC_ENV_EXEC from signatures, we assume that
  using icecc doesn't influence the output, so it shouldn't matter when
  user supplies own version of icecc or env script
* always compare ICECC_DISABLED with "1", boolean typed_value isn't used
  because documentation already mentions using empty value to keep icecc
  enabled and that's not valid boolean value when oe.data.typed_value is
  used:
  ERROR: ICECC_DISABLED: Invalid boolean value ''

(From OE-Core rev: c3e8bfe30685e2357a6eb3ba8f4a014c7dc9f58e)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2014-04-11 17:07:39 +02:00 committed by Richard Purdie
parent 1f8d809547
commit 1cb95f7bdf
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/classes/icecc.bbclass
View File

@ -28,7 +28,7 @@
#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_USER_PACKAGE_BL ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL"
BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_BL ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL ICECC_PATH ICECC_ENV_EXEC"
ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
@ -148,6 +148,10 @@ def icc_is_native(bb, d):
# Don't pollute allarch signatures with TARGET_FPU
icc_version[vardepsexclude] += "TARGET_FPU"
def icc_version(bb, d):
if d.getVar('ICECC_DISABLED') == "1":
# don't even try it, when explicitly disabled
return ""
if use_icc(bb, d) == "no":
return ""
@ -175,6 +179,10 @@ def icc_version(bb, d):
return tar_file
def icc_path(bb,d):
if d.getVar('ICECC_DISABLED') == "1":
# don't create unnecessary directories when icecc is disabled
return
if icc_is_kernel(bb, d):
return create_path( [get_cross_kernel_cc(bb,d), ], bb, d)
@ -238,7 +246,7 @@ def set_icecc_env():
return
set_icecc_env() {
if [ "x${ICECC_DISABLED}" != "x" ]
if [ "${ICECC_DISABLED}" = "1" ]
then
return
fi