diff options
| author |   Peter A. Bigot <pab@pabigot.com> | 2014-11-01 15:35:34 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:45 +0000 |
| commit | 0c18fdd44accbcc04731e1e3f1ce1faa5e350db9 (patch) | |
| tree | 01a1bc0ac77944499c6c1bff8b4553bd8ba98863 | |
| parent | 19134b005af620a115db4530409e164eff1e5d9e (diff) | |
| download | openembedded-core-contrib-0c18fdd44accbcc04731e1e3f1ce1faa5e350db9.tar.gz | |
bluez-hcidump: select provider as bluez4 or bluez5
bluez-hcidump was a separate package in bluez4, but was integrated into
bluez5.
(From OE-Core rev: 0dcaea0fcf38f0e382eda11e74ded1daeb98a8ac)
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/conf/distro/include/default-providers.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index a1167fdfbf..35509a7309 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -43,5 +43,6 @@ PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','sy # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details # on this rather strange entry. PREFERRED_PROVIDER_bluez4 ?= "bluez4" +PREFERRED_PROVIDER_bluez-hcidump ?= "bluez-hcidump" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb PREFERRED_PROVIDER_ltp ?= "ltp" diff --git a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb index 5c1f4760a8..3950630a86 100644 --- a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb +++ b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb @@ -3,7 +3,9 @@ DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bl and displays the commands, events and data in a human-readable form." SECTION = "console" +# hcidump was integrated into bluez5 DEPENDS = "bluez4" +RCONFLICTS_${PN} = "bluez5" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf" diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index c3dd946517..b385a916ef 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline" +PROVIDES += "bluez-hcidump" +RPROVIDES_${PN} += "bluez-hcidump" RCONFLICTS_${PN} = "bluez4" |