diff options
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 12 |
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}" | |||
735 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5" | 735 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5" |
736 | MACHINE_FEATURES_BACKFILL = "rtc" | 736 | MACHINE_FEATURES_BACKFILL = "rtc" |
737 | 737 | ||
738 | COMBINED_FEATURES = "\ | 738 | COMBINED_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)}" | ||
749 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" | 739 | COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" |
750 | 740 | ||
751 | SERIAL_CONSOLE ??= "" | 741 | SERIAL_CONSOLE ??= "" |