bluez4: update recipe from meta-oe

* fix DEPENDS
* fix typo in --enable-pandd option
* remove unsupported options
* update packaging
* remove distro override which doesn't belong to oe-core

(From OE-Core rev: dd678881dfd8626299ee3b68284d2f41f07c1c56)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 11 deletions

diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index ebd2849484..edba1676b9 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -7,12 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
                     file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
                     file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
+DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib usbpath"
 RDEPENDS_${PN}-dev = "bluez-hcidump"
 
-# For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
 ASNEEDED = ""
 
 PR = "r0"
@@ -24,6 +21,7 @@ SRC_URI = "\
 
 SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
 SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
+
 S = "${WORKDIR}/bluez-${PV}"
 
 inherit autotools
@@ -32,20 +30,16 @@ EXTRA_OECONF = "\
   --enable-gstreamer \
   --enable-alsa \
   --enable-usb \
-  --enable-netlink \
   --enable-tools \
   --enable-bccmd \
   --enable-hid2hci \
   --enable-dfutool \
   --enable-hidd \
-  --enable-pandd \
+  --enable-pand \
   --enable-dund \
   --disable-cups \
   --enable-test \
-  --enable-manpages \
   --enable-configfiles \
-  --enable-initscripts \
-  --disable-pcmciarules \
 "
 
 do_install_append() {
@@ -59,8 +53,8 @@ do_install_append() {
 PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
 
 FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
   ${libdir}/alsa-lib/*.la \
@@ -70,4 +64,5 @@ FILES_${PN}-dev += "\
 FILES_${PN}-dbg += "\
   ${libdir}/bluetooth/plugins/.debug \
   ${libdir}/*/.debug \
+  ${base_libdir}/udev/.debug \
 "