diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-23 19:26:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-24 16:37:07 +0000 |
commit | 72ce5c4cde612515451226a1b10f5b348a4a6a4c (patch) | |
tree | 4aac6cd016ce96e07299308102c39db120267169 /meta/conf | |
parent | 5ac604e67a267ae16a19ea8852098c58cf5f8ca2 (diff) | |
download | poky-72ce5c4cde612515451226a1b10f5b348a4a6a4c.tar.gz |
conf/bitbake.conf: add DISTRO_FEATURES_BACKFILL
When introducing new items to DISTRO_FEATURES that control functionality
that is already enabled, in order to leave existing distro configuration
unchanged we need a way to "backfill" these new feature items onto the
existing DISTRO_FEATURES value.
This introduces a DISTRO_FEATURES_BACKFILL variable whose items will be
added to the end of DISTRO_FEATURES, unless they also appear in
DISTRO_FEATURES_BACKFILL_CONSIDERED which distros can use in their
configuration to prevent specific items from being added.
Fixes [YOCTO #1946].
(From OE-Core rev: 738658d9d5ddef026d2929188744aa225324bf26)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 90e5f7a3bc..2539ae0f0a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -694,6 +694,9 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" | |||
694 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | 694 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" |
695 | IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" | 695 | IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" |
696 | 696 | ||
697 | DISTRO_FEATURES_BACKFILL = "" | ||
698 | DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}" | ||
699 | |||
697 | COMBINED_FEATURES = "\ | 700 | COMBINED_FEATURES = "\ |
698 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ | 701 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ |
699 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ | 702 | ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ |