From af91e98e32a76da587f3d7bcd4f767767ffe5fdc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 11 Apr 2014 17:07:39 +0200 Subject: 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) (From OE-Core rev: 41aeb447de70b5fb3e1d0ef4aa90376ad5caef4c) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 5c9e66c95e..3ec8c0667d 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -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 -- cgit v1.2.3-54-g00ecf