[PATCH 2/2] refactor: inject ccache environment similar to proxy env

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

Instead of configuring ccache in the build shell scripts,
we configure it by preparing the environment of the calling task.

The tasks invoke the build scripts using sudo.
By that, we have to modify the PATH variable inside sudo as
sudo itself clears it and sets it to the value of secure_path.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes/dpkg.bbclass                         | 3 ++-
 meta/recipes-devtools/buildchroot/files/build.sh  | 5 -----
 meta/recipes-devtools/buildchroot/files/common.sh | 4 +++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index 7da7334..27fe84f 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -32,7 +32,8 @@ addtask devshell after do_install_builddeps
 # Build package from sources using build script
 dpkg_runbuild() {
     E="${@ isar_export_proxies(d)}"
+    E="${@ isar_export_ccache(d)}"
     export PARALLEL_MAKE="${PARALLEL_MAKE}"
     sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
-         /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH} ${USE_CCACHE}
+         /isar/build.sh ${PP}/${PPS} ${PACKAGE_ARCH}
 }
diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh
index 8e6507c..101581d 100644
--- a/meta/recipes-devtools/buildchroot/files/build.sh
+++ b/meta/recipes-devtools/buildchroot/files/build.sh
@@ -14,9 +14,4 @@ for i in configure aclocal.m4 Makefile.am Makefile.in; do
     fi
 done
 
-if [ "$use_ccache" == "1" ]; then
-    export CCACHE_DIR=/ccache
-    export PATH=/usr/lib/ccache:$PATH
-fi
-
 ${GBP_PREFIX}dpkg-buildpackage -a$target_arch -d --source-option=-I
diff --git a/meta/recipes-devtools/buildchroot/files/common.sh b/meta/recipes-devtools/buildchroot/files/common.sh
index 7085f44..73226d8 100644
--- a/meta/recipes-devtools/buildchroot/files/common.sh
+++ b/meta/recipes-devtools/buildchroot/files/common.sh
@@ -17,7 +17,6 @@ fi
 
 # Create human-readable names
 target_arch=$2
-use_ccache=$3
 
 set_arch="--host-arch $target_arch"
 
@@ -28,3 +27,6 @@ cd "$1"
 export LC_ALL=C
 export LANG=C
 export LANGUAGE=C
+
+# allow for changes to the PATH variable
+export PATH=$PATH_PREPEND:$PATH
-- 
2.30.2