summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-06-14 12:33:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 14:53:58 +0100
commita83dc5b11373c418a855c6e50601732396e3185a (patch)
tree7575a1ee5a52d1a9cd6bfd66dc4e4d76287d79ce
parentd973074bf6d4c8f93041880b478ea77a3f9056cc (diff)
downloadpoky-a83dc5b11373c418a855c6e50601732396e3185a.tar.gz
Revert "bitbake.conf: DISTRO_FEATURES as overrides"
This reverts commit 3b3ae91a22d6f685e804df4f32cdeebe1bd6bd88. It turned out that the code which expands DISTRO_FEATURES early during base config parsing can fail because some entries in DISTRO_FEATURES might call Python functions like base_conditional() from base.bbclass which aren't defined yet. A different solution will be needed. (From OE-Core rev: 0c6e4a14ba8d9d9701ec16ffe46d618f41633571) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf17
1 files changed, 1 insertions, 16 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5d5ddec499..80baec8d40 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -713,28 +713,13 @@ DISTRO_NAME ??= "OpenEmbedded"
713# 713#
714# This works for functions as well, they are really just environment variables. 714# This works for functions as well, they are really just environment variables.
715# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. 715# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
716OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}${DISTROFEATURESOVERRIDES}:${CLASSOVERRIDE}:forcevariable" 716OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable"
717CLASSOVERRIDE ?= "class-target" 717CLASSOVERRIDE ?= "class-target"
718DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" 718DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
719MACHINEOVERRIDES ?= "${MACHINE}" 719MACHINEOVERRIDES ?= "${MACHINE}"
720 720
721FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}" 721FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}"
722 722
723# Turns certain DISTRO_FEATURES into overrides of the same name
724# or (optionally) some other name. Ensures that these special
725# distro features remain set also for native and nativesdk
726# recipes, so that these overrides can also be used there.
727#
728# Beware that this part of OVERRIDES changes during parsing, so usage
729# of these overrides should be limited to .bb and .bbappend files,
730# because then DISTRO_FEATURES is final.
731DISTRO_FEATURES_OVERRIDES ??= ""
732DISTRO_FEATURES_OVERRIDES[doc] = "A space-separated list of <feature> entries. \
733Each entry is added to OVERRIDES as df-<feature> if <feature> is in DISTRO_FEATURES."
734DISTRO_FEATURES_FILTER_NATIVE_append = " ${DISTRO_FEATURES_OVERRIDES}"
735DISTRO_FEATURES_FILTER_NATIVESDK_append = " ${DISTRO_FEATURES_OVERRIDES}"
736DISTROFEATURESOVERRIDES = "${@ ''.join([':df-' + x for x in (set(d.getVar('DISTRO_FEATURES_OVERRIDES').split()) & set((d.getVar('DISTRO_FEATURES') or '').split()))]) }"
737
738################################################################## 723##################################################################
739# Include the rest of the config files. 724# Include the rest of the config files.
740################################################################## 725##################################################################