summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2021-01-19 01:23:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-20 00:41:39 +0000
commit1b659623430e1a6e6dd266e65bab7ca8155a7138 (patch)
tree5faf18a966d20f5305f2efb0d93fc5655c5196be
parentd430f425e1a5725e93833a652e5c6988576f7347 (diff)
downloadopenembedded-core-contrib-1b659623430e1a6e6dd266e65bab7ca8155a7138.tar.gz
openembedded-core-contrib-1b659623430e1a6e6dd266e65bab7ca8155a7138.tar.bz2
openembedded-core-contrib-1b659623430e1a6e6dd266e65bab7ca8155a7138.zip
Revert "ccache.bbclass: use ccache from host distribution"
This reverts commit f5b29367af4d8e5daea5771264774aa49519f9a8. Will use ccache-native which is more reliable. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/ccache.bbclass3
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/lib/oeqa/selftest/cases/buildoptions.py8
3 files changed, 6 insertions, 7 deletions
diff --git a/meta/classes/ccache.bbclass b/meta/classes/ccache.bbclass
index f00fafc292..fc4745609c 100644
--- a/meta/classes/ccache.bbclass
+++ b/meta/classes/ccache.bbclass
@@ -1,7 +1,5 @@
#
# Usage:
-# - Install ccache package on the host distribution and set up a build directory
-#
# - Enable ccache
# Add the following line to a conffile such as conf/local.conf:
# INHERIT += "ccache"
@@ -53,6 +51,7 @@ python() {
# quilt-native doesn't need ccache since no c files
if not (pn in ('ccache-native', 'quilt-native') or
bb.utils.to_boolean(d.getVar('CCACHE_DISABLE'))):
+ d.appendVar('DEPENDS', ' ccache-native')
d.setVar('CCACHE', 'ccache ')
}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index be94b78eb1..74976ac05c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -498,7 +498,7 @@ HOSTTOOLS += " \
HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}"
# Link to these if present
-HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo"
+HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo"
# Temporary add few more detected in bitbake world
HOSTTOOLS_NONFATAL += "join nl size yes zcat"
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index d0f6477300..e91f0bd18f 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -33,10 +33,10 @@ class ImageOptionsTests(OESelftestTestCase):
self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed)
def test_ccache_tool(self):
- bb_vars = get_bb_vars(['HOSTTOOLS_DIR'], 'm4-native')
- p = bb_vars['HOSTTOOLS_DIR'] + "/" + "ccache"
- if not os.path.isfile(p):
- self.skipTest("No ccache binary found in %s" % bb_vars['HOSTTOOLS_DIR'])
+ bitbake("ccache-native")
+ bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native')
+ p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache"
+ self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p)
self.write_config('INHERIT += "ccache"')
self.add_command_to_tearDown('bitbake -c clean m4-native')
bitbake("m4-native -c clean")