mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

Revert "ccache.bbclass: use ccache from host distribution"

Browse Source 
This reverts commit f5b29367af4d8e5daea5771264774aa49519f9a8.

Will use ccache-native which is more reliable.

(From OE-Core rev: 1b659623430e1a6e6dd266e65bab7ca8155a7138)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2021-01-19 01:23:43 -08:00
committed by Richard Purdie
parent 496d849224
commit 220a5fcb99
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/ccache.bbclass
+1 -2
View File
@@ -1,7 +1,5 @@
# #
# Usage: # Usage:
# - Install ccache package on the host distribution and set up a build directory
#
# - Enable ccache # - Enable ccache
# Add the following line to a conffile such as conf/local.conf: # Add the following line to a conffile such as conf/local.conf:
# INHERIT += "ccache" # INHERIT += "ccache"
@@ -53,6 +51,7 @@ python() {
# quilt-native doesn't need ccache since no c files # quilt-native doesn't need ccache since no c files
if not (pn in ('ccache-native', 'quilt-native') or if not (pn in ('ccache-native', 'quilt-native') or
bb.utils.to_boolean(d.getVar('CCACHE_DISABLE'))): bb.utils.to_boolean(d.getVar('CCACHE_DISABLE'))):
d.appendVar('DEPENDS', ' ccache-native')
d.setVar('CCACHE', 'ccache ') d.setVar('CCACHE', 'ccache ')
} }
meta/conf/bitbake.conf
+1 -1
View File
@@ -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 ''}" 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 # 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 # Temporary add few more detected in bitbake world
HOSTTOOLS_NONFATAL += "join nl size yes zcat" HOSTTOOLS_NONFATAL += "join nl size yes zcat"
meta/lib/oeqa/selftest/cases/buildoptions.py
+4 -4
View File
@@ -33,10 +33,10 @@ class ImageOptionsTests(OESelftestTestCase):
self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed)
def test_ccache_tool(self): def test_ccache_tool(self):
bb_vars = get_bb_vars(['HOSTTOOLS_DIR'], 'm4-native') bitbake("ccache-native")
p = bb_vars['HOSTTOOLS_DIR'] + "/" + "ccache" bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native')
if not os.path.isfile(p): p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache"
self.skipTest("No ccache binary found in %s" % bb_vars['HOSTTOOLS_DIR']) self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p)
self.write_config('INHERIT += "ccache"') self.write_config('INHERIT += "ccache"')
self.add_command_to_tearDown('bitbake -c clean m4-native') self.add_command_to_tearDown('bitbake -c clean m4-native')
bitbake("m4-native -c clean") bitbake("m4-native -c clean")