[oe-commits] [openembedded-core] 88/94: bitbake.conf: don't set CCACHE_DIR to $HOME by default

[git at git.openembedded.org]

rpurdie pushed a commit to branch krogoth
in repository openembedded-core.

commit 8bcfed5a5d8c53a481028ef6e55008670cfbe8dc
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Jun 20 13:13:09 2016 +0100

    bitbake.conf: don't set CCACHE_DIR to $HOME by default
    
    If the user hasn't inherited ccache.bbclass then CCACHE_DIR is set to $HOME.
    
    This was to work around a bug (#2554) for some users where if ccache < 3.1.10
    (released 2014-10-19) was installed and enabled by default (i.e. /usr/bin/gcc is
    a symlink to ccache) and ccache.bbclass wasn't being inherited then autogen
    would fail to build because it sets $HOME to /dev/null during the build and
    ccache (prior to 3.1.10) would always create CCACHE_DIR even if it was disabled.
    As the default is $HOME/.ccache, this results in ccache attempting to create
    /dev/null/.ccache.
    
    However there was a mistake in this assignment of CCACHE_DIR - it should be
    $HOME/.ccache - as ccache will do cleanup inside CCACHE_DIR which will result in
    it deleting $HOME/tmp.  In the future when we can assume that everyone has
    ccache 3.1.10 onwards this assignment can be deleted, but as of now we still
    support OpenSUSE 13.2 which ships with 3.1.9 so fix the assignment to be
    $HOME/.ccache.
    
    [ YOCTO #9798 ]
    
    (From OE-Core rev: 15eaf9cb1fa19036fe4442905876dae94070b04d)
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster at mvista.com>
---
 meta/conf/bitbake.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 878c20a..b623276 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -444,10 +444,10 @@ CCACHE ??= ""
 # Disable ccache explicitly if CCACHE is null since gcc may be a symlink
 # of ccache some distributions (e.g., Fedora 17).
 export CCACHE_DISABLE ??= "${@[0,1][d.getVar('CCACHE', True) == '']}"
-# Assign CCACHE_DIR a default value to fix a bug of ccache 3.1.7,
-# since it would always create CCACHE_DIR/.ccache even if
-# CCACHE_DISABLE = 1.
-export CCACHE_DIR ??= "${@os.getenv('HOME')}"
+# ccache < 3.1.10 will create CCACHE_DIR on startup even if disabled, and
+# autogen sets HOME=/dev/null so in certain situations builds can fail.
+# Explicitly export CCACHE_DIR until we can assume ccache >3.1.10 on the host.
+export CCACHE_DIR ??= "${@os.getenv('HOME')}/.ccache"
 
 TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.