summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-12-11 19:24:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-14 09:11:17 +0000
commit94090391d4310193d0421303c3b6c6f101fc430b (patch)
tree390de299019d182be3f1d47223939cee1227f9ad /meta/recipes-connectivity
parent6bc2df55a5d78356bb6375340db01999c49db1b0 (diff)
downloadpoky-94090391d4310193d0421303c3b6c6f101fc430b.tar.gz
bluez5: upgrade to 5.12
- Configure options no longer available were removed. - The content of patch directory was generic, so the name of directory is now generic. - Switched to xz format for tarball (40% decrease in download size). (From OE-Core rev: 4c968a803a45620efbd0dc7979a7c1b6d28473a6) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc11
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf (renamed from meta/recipes-connectivity/bluez5/bluez5-5.10/bluetooth.conf)0
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.10.bb5
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.12.bb5
4 files changed, 6 insertions, 15 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 2e25d86e55..e08dff4ca5 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -11,11 +11,10 @@ DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
11RCONFLICTS_${PN} = "bluez4" 11RCONFLICTS_${PN} = "bluez4"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles" 13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles"
14PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
15PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" 14PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
16 15
17SRC_URI = "\ 16SRC_URI = "\
18 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ 17 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
19 file://bluetooth.conf \ 18 file://bluetooth.conf \
20" 19"
21S = "${WORKDIR}/bluez-${PV}" 20S = "${WORKDIR}/bluez-${PV}"
@@ -23,15 +22,7 @@ S = "${WORKDIR}/bluez-${PV}"
23inherit autotools pkgconfig systemd 22inherit autotools pkgconfig systemd
24 23
25EXTRA_OECONF = "\ 24EXTRA_OECONF = "\
26 --disable-gstreamer \
27 --enable-usb \
28 --enable-tools \ 25 --enable-tools \
29 --enable-bccmd \
30 --enable-hid2hci \
31 --enable-dfutool \
32 --disable-hidd \
33 --disable-pand \
34 --disable-dund \
35 --disable-cups \ 26 --disable-cups \
36 --enable-test \ 27 --enable-test \
37 --enable-datafiles \ 28 --enable-datafiles \
diff --git a/meta/recipes-connectivity/bluez5/bluez5-5.10/bluetooth.conf b/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf
index ca5e9e4f2f..ca5e9e4f2f 100644
--- a/meta/recipes-connectivity/bluez5/bluez5-5.10/bluetooth.conf
+++ b/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.10.bb b/meta/recipes-connectivity/bluez5/bluez5_5.10.bb
deleted file mode 100644
index 57dd4ff141..0000000000
--- a/meta/recipes-connectivity/bluez5/bluez5_5.10.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require bluez5.inc
2
3SRC_URI[md5sum] = "9bcc1d81e392e5be27fb11b1aad71abe"
4SRC_URI[sha256sum] = "39360c4c58158cb1d5dcc56d34a0a676d8868ef8c82b3083fc7396be5e8c3963"
5
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.12.bb b/meta/recipes-connectivity/bluez5/bluez5_5.12.bb
new file mode 100644
index 0000000000..126ab11208
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.12.bb
@@ -0,0 +1,5 @@
1require bluez5.inc
2
3SRC_URI[md5sum] = "5d37e581107b3d6f91b81194a5006407"
4SRC_URI[sha256sum] = "75ef574f15f356d03bd54f1a8ba26abe63bf3d1326a9fa12d63a762ddf40617e"
5