diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/default-providers.inc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 5e93f5c223..140f45b895 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -839,7 +839,7 @@ DISTRO_FEATURES_NATIVESDK ?= "x11" | |||
839 | DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation" | 839 | DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation" |
840 | DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation" | 840 | DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation" |
841 | 841 | ||
842 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data ldconfig" | 842 | DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig" |
843 | MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" | 843 | MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" |
844 | 844 | ||
845 | COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" | 845 | COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" |
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 2be3378773..8f4d44d884 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
@@ -44,7 +44,6 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" | |||
44 | PREFERRED_PROVIDER_console-tools ?= "kbd" | 44 | PREFERRED_PROVIDER_console-tools ?= "kbd" |
45 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" | 45 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" |
46 | PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" | 46 | PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" |
47 | PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" | ||
48 | # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb | 47 | # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb |
49 | PREFERRED_PROVIDER_ltp ?= "ltp" | 48 | PREFERRED_PROVIDER_ltp ?= "ltp" |
50 | PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" | 49 | PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" |