summaryrefslogtreecommitdiffstats
path: root/meta/conf
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:46 +0100
commita32ddf91bc23cd6c3976f569335ae591e2c86c4d (patch)
treed934bfa8eef2f1f29ec9b1a0643473a608d29e95 /meta/conf
parenta288b331f217b66d88bd3b85ab499543e63e6842 (diff)
downloadpoky-a32ddf91bc23cd6c3976f569335ae591e2c86c4d.tar.gz
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) (From OE-Core rev: 57aa60ef6422568b425b6ccc4451567efc578469) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-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 5d994f067d..a318d1ca58 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
357# General work and output directories for the build system. 357# General work and output directories for the build system.
358################################################################## 358##################################################################
359 359
360TCMODE ?= "default"
361TCLIBC ?= "glibc"
360TMPDIR ?= "${TOPDIR}/tmp" 362TMPDIR ?= "${TOPDIR}/tmp"
361CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}" 363
364CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
362# The persistent cache should be shared by all builds 365# The persistent cache should be shared by all builds
363PERSISTENT_DIR = "${TOPDIR}/cache" 366PERSISTENT_DIR = "${TOPDIR}/cache"
364LOG_DIR = "${TMPDIR}/log" 367LOG_DIR = "${TMPDIR}/log"
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index 66fd246526..b36a4ffffe 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -3,10 +3,7 @@ include conf/distro/include/default-versions.inc
3include conf/distro/include/default-distrovars.inc 3include conf/distro/include/default-distrovars.inc
4include conf/distro/include/maintainers.inc 4include conf/distro/include/maintainers.inc
5 5
6TCMODE ?= "default"
7require conf/distro/include/tcmode-${TCMODE}.inc 6require conf/distro/include/tcmode-${TCMODE}.inc
8
9TCLIBC ?= "glibc"
10require conf/distro/include/tclibc-${TCLIBC}.inc 7require conf/distro/include/tclibc-${TCLIBC}.inc
11 8
12require conf/distro/include/uninative-flags.inc 9require conf/distro/include/uninative-flags.inc
@@ -15,8 +12,6 @@ require conf/distro/include/uninative-flags.inc
15TCLIBCAPPEND ?= "-${TCLIBC}" 12TCLIBCAPPEND ?= "-${TCLIBC}"
16TMPDIR .= "${TCLIBCAPPEND}" 13TMPDIR .= "${TCLIBCAPPEND}"
17 14
18CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
19
20USER_CLASSES ?= "" 15USER_CLASSES ?= ""
21PACKAGE_CLASSES ?= "package_ipk" 16PACKAGE_CLASSES ?= "package_ipk"
22INHERIT_BLACKLIST = "blacklist" 17INHERIT_BLACKLIST = "blacklist"