aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-09-16 15:28:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-17 09:47:22 +0100
commit57aa60ef6422568b425b6ccc4451567efc578469 (patch)
treeb5ffb0de644256e3890e0971102e21ad5792cafe
parentd3b2302bcc1594e663183134793cf4aca8f4df41 (diff)
downloadopenembedded-core-contrib-57aa60ef6422568b425b6ccc4451567efc578469.tar.gz
openembedded-core-contrib-57aa60ef6422568b425b6ccc4451567efc578469.tar.bz2
openembedded-core-contrib-57aa60ef6422568b425b6ccc4451567efc578469.zip
bitbake.conf: use ${TCMODE}-${TCLIBC} directory for CACHE
* move TCMODE and TCLIBC from defaultsetup.conf to bitbake.conf * set CACHE as it was in defaultsetup.conf and drop it from defaultsetup.conf * most if not all DISTROs are now including defaultsetup.conf and TCLIBC is pretty much expected to be always set correctly, e.g.: meta/recipes-core/systemd/systemd_243.2.bb: if d.getVar('TCLIBC') == "musl": meta/recipes-devtools/gcc/gcc-runtime.inc: if [ "${TCLIBC}" != "glibc" ]; then meta/recipes-devtools/gcc/libgcc.inc: if [ "${TCLIBC}" != "glibc" ]; then meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb:ENV_NAME="${DISTRO}-${TCLIBC}-${SDK_ARCH}-@TARGET_PREFIX@${DISTRO_VERSION}.tar.gz" meta/recipes-devtools/valgrind/valgrind_3.15.0.bb:RRECOMMENDS_${PN} += "${TCLIBC}-dbg" meta/recipes-kernel/linux/kernel-devsrc.bb:RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils" meta/classes/buildhistory.bbclass:BUILDHISTORY_DIR_IMAGE = "${BUILDHISTORY_DIR}/images/${MACHINE_ARCH}/${TCLIBC}/${IMAGE_BASENAME}" meta/classes/cross-canadian.bbclass: if d.getVar("TCLIBC") in [ 'baremetal', 'newlib' ]: meta/classes/kernel.bbclass: tclibc = d.getVar('TCLIBC') meta/classes/toaster.bbclass: BUILDHISTORY_DIR_IMAGE_BASE = e.data.expand("%s/images/${MACHINE_ARCH}/${TCLIBC}/"% BUILDHISTORY_DIR) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf5
-rw-r--r--meta/conf/distro/defaultsetup.conf5
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5d994f067d1..a318d1ca588 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -357,8 +357,11 @@ FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar
# General work and output directories for the build system.
##################################################################
+TCMODE ?= "default"
+TCLIBC ?= "glibc"
TMPDIR ?= "${TOPDIR}/tmp"
-CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
+
+CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
# The persistent cache should be shared by all builds
PERSISTENT_DIR = "${TOPDIR}/cache"
LOG_DIR = "${TMPDIR}/log"
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 66fd2465260..b36a4ffffe5 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -3,10 +3,7 @@ include conf/distro/include/default-versions.inc
include conf/distro/include/default-distrovars.inc
include conf/distro/include/maintainers.inc
-TCMODE ?= "default"
require conf/distro/include/tcmode-${TCMODE}.inc
-
-TCLIBC ?= "glibc"
require conf/distro/include/tclibc-${TCLIBC}.inc
require conf/distro/include/uninative-flags.inc
@@ -15,8 +12,6 @@ require conf/distro/include/uninative-flags.inc
TCLIBCAPPEND ?= "-${TCLIBC}"
TMPDIR .= "${TCLIBCAPPEND}"
-CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
-
USER_CLASSES ?= ""
PACKAGE_CLASSES ?= "package_ipk"
INHERIT_BLACKLIST = "blacklist"