diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2018-05-09 20:14:55 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-22 13:09:03 +0100 |
| commit | b3598b8f1ed1cdc7849e1e4f30d618e87e1bf582 (patch) | |
| tree | cfc10d351075b4f965920a4205bdd79751443b39 | |
| parent | c330036e1e6151246b736f88f7412e9e4ac38d5f (diff) | |
| download | openembedded-core-b3598b8f1ed1cdc7849e1e4f30d618e87e1bf582.tar.gz openembedded-core-b3598b8f1ed1cdc7849e1e4f30d618e87e1bf582.tar.bz2 openembedded-core-b3598b8f1ed1cdc7849e1e4f30d618e87e1bf582.zip | |
bitbake.conf: make libc over-ride lower priority than _forcevariable
Fix long standing quirk, _forcevariable is documented as being the
highest priority over-ride.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-baremetal.inc | 2 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-glibc.inc | 2 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-musl.inc | 2 |
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" # # This works for functions as well, they are really just environment variables. # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +LIBCOVERRIDE ?= "" CLASSOVERRIDE ?= "class-target" DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" MACHINEOVERRIDES ?= "${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 @@ LIBCEXTENSION = "" -# Add baremetal libc overrides to the overrides. LIBCOVERRIDE = ":libc-baremetal" -OVERRIDES .= "${LIBCOVERRIDE}" ASSUME_PROVIDED += "virtual/libc virtual/libiconv virtual/crypt" 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 @@ LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}" -# Add glibc overrides to the overrides for glibc. LIBCOVERRIDE = ":libc-glibc" -OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_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 @@ LIBCEXTENSION = "-musl" -# Add musl libc overrides to the overrides. LIBCOVERRIDE = ":libc-musl" -OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libc ?= "musl" PREFERRED_PROVIDER_virtual/libiconv ?= "musl" |