summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-08-17 16:29:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-19 09:29:19 -0700
commitb174d51b42b791ae8dd4da8f1d0627e48162b7ab (patch)
treeed0a4173ecbf3a9f6a1ad62ad5e70b281eb95f72
parenta6e564b6ab21f047131b4e90f94c658c1afba3ca (diff)
downloadpoky-b174d51b42b791ae8dd4da8f1d0627e48162b7ab.tar.gz
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>
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.96.bb17
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 \
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 \
9 file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" 9 file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
10DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl" 10DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib usbpath"
11RDEPENDS_${PN}-dev = "bluez-hcidump" 11RDEPENDS_${PN}-dev = "bluez-hcidump"
12 12
13# For angstrom we want this to replace at least bluez-libs
14PROVIDES_append_angstrom = " bluez-utils bluez-libs"
15
16ASNEEDED = "" 13ASNEEDED = ""
17 14
18PR = "r0" 15PR = "r0"
@@ -24,6 +21,7 @@ SRC_URI = "\
24 21
25SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518" 22SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
26SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99" 23SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
24
27S = "${WORKDIR}/bluez-${PV}" 25S = "${WORKDIR}/bluez-${PV}"
28 26
29inherit autotools 27inherit autotools
@@ -32,20 +30,16 @@ EXTRA_OECONF = "\
32 --enable-gstreamer \ 30 --enable-gstreamer \
33 --enable-alsa \ 31 --enable-alsa \
34 --enable-usb \ 32 --enable-usb \
35 --enable-netlink \
36 --enable-tools \ 33 --enable-tools \
37 --enable-bccmd \ 34 --enable-bccmd \
38 --enable-hid2hci \ 35 --enable-hid2hci \
39 --enable-dfutool \ 36 --enable-dfutool \
40 --enable-hidd \ 37 --enable-hidd \
41 --enable-pandd \ 38 --enable-pand \
42 --enable-dund \ 39 --enable-dund \
43 --disable-cups \ 40 --disable-cups \
44 --enable-test \ 41 --enable-test \
45 --enable-manpages \
46 --enable-configfiles \ 42 --enable-configfiles \
47 --enable-initscripts \
48 --disable-pcmciarules \
49" 43"
50 44
51do_install_append() { 45do_install_append() {
@@ -59,8 +53,8 @@ do_install_append() {
59PACKAGES =+ "gst-plugin-bluez libasound-module-bluez" 53PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
60 54
61FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so" 55FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
62FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so" 56FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
63FILES_${PN} += "${libdir}/bluetooth/plugins/*.so" 57FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${base_libdir}/systemd/"
64FILES_${PN}-dev += "\ 58FILES_${PN}-dev += "\
65 ${libdir}/bluetooth/plugins/*.la \ 59 ${libdir}/bluetooth/plugins/*.la \
66 ${libdir}/alsa-lib/*.la \ 60 ${libdir}/alsa-lib/*.la \
@@ -70,4 +64,5 @@ FILES_${PN}-dev += "\
70FILES_${PN}-dbg += "\ 64FILES_${PN}-dbg += "\
71 ${libdir}/bluetooth/plugins/.debug \ 65 ${libdir}/bluetooth/plugins/.debug \
72 ${libdir}/*/.debug \ 66 ${libdir}/*/.debug \
67 ${base_libdir}/udev/.debug \
73" 68"