[PATCH 2/5] move CCACHE_DISABLE env var to function

[Felix Moessbauer <felix.moessbauer@siemens.com>]

This patch moves the CCACHE_DISABLE environment variable
to the isar_export_ccache function to consolidate the code.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/base.bbclass | 2 ++
 meta/classes/dpkg.bbclass | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 17dfeab9..8c874f31 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -177,6 +177,8 @@ def isar_export_ccache(d):
         if d.getVar('CCACHE_DEBUG') == '1':
             os.environ['CCACHE_DEBUG'] = '1'
             os.environ['CCACHE_DEBUGDIR'] = '/ccache/debug'
+    else:
+        os.environ['CCACHE_DISABLE'] = '1'
 
 do_fetch[dirs] = "${DL_DIR}"
 do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}"
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 67b5aac6..0f1112ff 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -34,6 +34,7 @@ dpkg_runbuild() {
         # Don't warn some variables
         [ "${var}" = "PARALLEL_MAKE" ] && continue
         [ "${var}" = "CCACHE_DIR" ] && continue
+        [ "${var}" = "CCACHE_DISABLE" ] && continue
         [ "${var}" = "PATH_PREPEND" ] && continue
         [ "${var}" = "DEB_BUILD_OPTIONS" ] && continue
 
@@ -62,8 +63,6 @@ dpkg_runbuild() {
 
     if [ ${USE_CCACHE} -eq 1 ]; then
         schroot_configure_ccache
-    else
-        sbuild_export CCACHE_DISABLE "1"
     fi
 
     profiles="${@ isar_deb_build_profiles(d)}"
-- 
2.30.2