diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-14 14:33:51 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-15 06:59:43 +0100 |
| commit | 7f9d01eb177021c022230ca15c293948faa1d962 (patch) | |
| tree | 7bf8e18656bda6c047ce26040b5c1a420fb8b18c /meta/conf/distro | |
| parent | 76f4bbc30e8aab7f6caf40a0a8e574399e4e8db2 (diff) | |
| download | poky-7f9d01eb177021c022230ca15c293948faa1d962.tar.gz | |
default-providers: Update to use PREFERRED_RPROVIDER
Get rid of the very confusing PREFERRED_PROVIDER_bluez4 using the
new/better PREFERRED_RPROVIDER syntax.
[YOCTO #5044]
(From OE-Core rev: e5c43dc7f1e17f360b5dc762045ccf7895d18843)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 5801b67f35..b2548e1b4c 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
| @@ -46,10 +46,8 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" | |||
| 46 | PREFERRED_PROVIDER_console-tools ?= "kbd" | 46 | PREFERRED_PROVIDER_console-tools ?= "kbd" |
| 47 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" | 47 | PREFERRED_PROVIDER_gzip-native ?= "pigz-native" |
| 48 | PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" | 48 | PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" |
| 49 | # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details | 49 | PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" |
| 50 | # on this rather strange entry. | 50 | PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" |
| 51 | PREFERRED_PROVIDER_bluez4 ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" | ||
| 52 | PREFERRED_PROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" | ||
| 53 | # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb | 51 | # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb |
| 54 | PREFERRED_PROVIDER_ltp ?= "ltp" | 52 | PREFERRED_PROVIDER_ltp ?= "ltp" |
| 55 | PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" | 53 | PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" |