Instead of hard-coding the set of features that can be considered in COMBINED_FEATURES, simply generate the union of DISTRO_FEATURES and MACHINE_FEATURES.
Signed-off-by: Ross Burton <[email protected]> --- 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 8653a7f..88b004f 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_union('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" SERIAL_CONSOLE ??= "" -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
