From a66f812d4395dc27e22d0c99568aed0a6493df12 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 22 May 2015 12:30:31 +0100 Subject: 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. Signed-off-by: Ross Burton --- meta/conf/bitbake.conf | 12 +----------- 1 file changed, 1 insertion(+), 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}" DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5" MACHINE_FEATURES_BACKFILL = "rtc" -COMBINED_FEATURES = "\ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" +COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" SERIAL_CONSOLE ??= "" -- cgit 1.2.3-korg