summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2014-11-01 15:35:34 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-11 11:34:56 +0000
commit756cb160a7bd6d5c94f5f080b96f792ff756735a (patch)
treecc28afeff6f0782bf0141d70a91bce4a61412746 /meta/recipes-connectivity
parent74d4a5cb908c08f5e76886923430f898b4d62015 (diff)
downloadpoky-756cb160a7bd6d5c94f5f080b96f792ff756735a.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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb2
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc2
2 files changed, 4 insertions, 0 deletions
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
3and displays the commands, events and data in a human-readable form." 3and displays the commands, events and data in a human-readable form."
4 4
5SECTION = "console" 5SECTION = "console"
6# hcidump was integrated into bluez5
6DEPENDS = "bluez4" 7DEPENDS = "bluez4"
8RCONFLICTS_${PN} = "bluez5"
7LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
9 file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf" 11 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 28c014fd66..f782528c86 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 \
7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ 7 file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" 8 file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e"
9DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline" 9DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
10PROVIDES += "bluez-hcidump"
11RPROVIDES_${PN} += "bluez-hcidump"
10 12
11RCONFLICTS_${PN} = "bluez4" 13RCONFLICTS_${PN} = "bluez4"
12 14