summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-09 20:14:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:13:33 +0100
commit2811907b1aefa50cb44c1509996ca8e80c6a84f4 (patch)
tree5b146fa80f658feaa397a33186cb10d8225a894f
parent7ccd4a201c13a94f3af1bbf8d48ccb311e86b03b (diff)
downloadpoky-2811907b1aefa50cb44c1509996ca8e80c6a84f4.tar.gz
bitbake.conf: make libc over-ride lower priority than _forcevariable
Fix long standing quirk, _forcevariable is documented as being the highest priority over-ride. (From OE-Core rev: b3598b8f1ed1cdc7849e1e4f30d618e87e1bf582) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/distro/include/tclibc-baremetal.inc2
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc2
-rw-r--r--meta/conf/distro/include/tclibc-musl.inc2
4 files changed, 2 insertions, 7 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a21b7282fb..a772cabdcf 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -735,7 +735,8 @@ DISTRO_NAME ??= "OpenEmbedded"
735# 735#
736# This works for functions as well, they are really just environment variables. 736# This works for functions as well, they are really just environment variables.
737# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. 737# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
738OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable" 738OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
739LIBCOVERRIDE ?= ""
739CLASSOVERRIDE ?= "class-target" 740CLASSOVERRIDE ?= "class-target"
740DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" 741DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
741MACHINEOVERRIDES ?= "${MACHINE}" 742MACHINEOVERRIDES ?= "${MACHINE}"
diff --git a/meta/conf/distro/include/tclibc-baremetal.inc b/meta/conf/distro/include/tclibc-baremetal.inc
index 8d570f03f1..1bf44c8591 100644
--- a/meta/conf/distro/include/tclibc-baremetal.inc
+++ b/meta/conf/distro/include/tclibc-baremetal.inc
@@ -4,9 +4,7 @@
4 4
5LIBCEXTENSION = "" 5LIBCEXTENSION = ""
6 6
7# Add baremetal libc overrides to the overrides.
8LIBCOVERRIDE = ":libc-baremetal" 7LIBCOVERRIDE = ":libc-baremetal"
9OVERRIDES .= "${LIBCOVERRIDE}"
10 8
11ASSUME_PROVIDED += "virtual/libc virtual/libiconv virtual/crypt" 9ASSUME_PROVIDED += "virtual/libc virtual/libiconv virtual/crypt"
12 10
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index ad8000f5de..8d1076440f 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -4,9 +4,7 @@
4 4
5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}" 5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}"
6 6
7# Add glibc overrides to the overrides for glibc.
8LIBCOVERRIDE = ":libc-glibc" 7LIBCOVERRIDE = ":libc-glibc"
9OVERRIDES .= "${LIBCOVERRIDE}"
10 8
11PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" 9PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
12PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" 10PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"
diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
index 54e1acf1df..052ae0e23b 100644
--- a/meta/conf/distro/include/tclibc-musl.inc
+++ b/meta/conf/distro/include/tclibc-musl.inc
@@ -4,9 +4,7 @@
4 4
5LIBCEXTENSION = "-musl" 5LIBCEXTENSION = "-musl"
6 6
7# Add musl libc overrides to the overrides.
8LIBCOVERRIDE = ":libc-musl" 7LIBCOVERRIDE = ":libc-musl"
9OVERRIDES .= "${LIBCOVERRIDE}"
10 8
11PREFERRED_PROVIDER_virtual/libc ?= "musl" 9PREFERRED_PROVIDER_virtual/libc ?= "musl"
12PREFERRED_PROVIDER_virtual/libiconv ?= "musl" 10PREFERRED_PROVIDER_virtual/libiconv ?= "musl"