summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-05-22 12:30:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-24 07:19:19 +0100
commitef19b19e358a46658949173873189dcabf6259bc (patch)
tree38a029ab3a5bf41410c0c600f94c5482ae6b219e
parenta60aeca3f50edead5445aa83fb9cf0b9cc3e9a6a (diff)
downloadpoky-ef19b19e358a46658949173873189dcabf6259bc.tar.gz
bitbake.conf: programatically generate COMBINED_FEATURES
Instead of hard-coding the set of features that can be considered in COMBINED_FEATURES, simply generate the intersection of DISTRO_FEATURES and MACHINE_FEATURES. (From OE-Core rev: a66f812d4395dc27e22d0c99568aed0a6493df12) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf12
1 files changed, 1 insertions, 11 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8653a7f3a9..9c72044d8d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -735,17 +735,7 @@ IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
735DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5" 735DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5"
736MACHINE_FEATURES_BACKFILL = "rtc" 736MACHINE_FEATURES_BACKFILL = "rtc"
737 737
738COMBINED_FEATURES = "\ 738COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}"
739 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
740 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
741 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
742 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \
743 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
744 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
745 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \
746 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
747 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
748 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
749COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" 739COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
750 740
751SERIAL_CONSOLE ??= "" 741SERIAL_CONSOLE ??= ""