* [PATCHv3 01/10] bluez5: upgrade to 5.28
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 02/10] bluetooth.bbclass: simplify recipe inference of bluetooth provider Peter A. Bigot
` (9 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
- Fixes to GATT service discovery & probing
- Fix for bearer selection with dual-mode devices
- Fix potential crash when removing devices
- Fix issue with incomplete names in EIR data
- Fix parsing GATT name characteristics
- Fix AVCTP long press & key repetition handling
- Fixes for GATT notification handling
hex2hcd graduated to installed tool; two new noinst tools
See: http://www.bluez.org/release-of-bluez-5-28/
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
.../recipes-connectivity/bluez5/{bluez5_5.27.bb => bluez5_5.28.bb} | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-connectivity/bluez5/{bluez5_5.27.bb => bluez5_5.28.bb} (85%)
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.27.bb b/meta/recipes-connectivity/bluez5/bluez5_5.28.bb
similarity index 85%
rename from meta/recipes-connectivity/bluez5/bluez5_5.27.bb
rename to meta/recipes-connectivity/bluez5/bluez5_5.28.bb
index 9497ee5..e816998 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.27.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.28.bb
@@ -1,6 +1,6 @@
require bluez5.inc
-SRC_URI[md5sum] = "a8fc508690e497e88c2c0b373cd653a8"
-SRC_URI[sha256sum] = "fbf33cebc76f8c81f28f0d67c71a8a1ec4b04b087460ec7353f7e0c207a1f981"
+SRC_URI[md5sum] = "bc20a8285530758c68f6a60e4ca62a15"
+SRC_URI[sha256sum] = "85bab48f4b47a158739028682c1e09cf30099c8ea9dfe63360055f8e06fc18a9"
# noinst programs in Makefile.tools that are conditional on READLINE
# support
@@ -40,9 +40,10 @@ NOINST_TOOLS_EXPERIMENTAL ?= " \
tools/btsnoop \
tools/btproxy \
tools/btiotest \
+ tools/mcaptest \
tools/cltest \
+ tools/oobtest \
tools/seq2bseq \
- tools/hex2hcd \
tools/ibeacon \
tools/btgatt-client \
tools/btgatt-server \
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 02/10] bluetooth.bbclass: simplify recipe inference of bluetooth provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 01/10] bluez5: upgrade to 5.28 Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 03/10] packagegroup-base: select distro preference for bluez provider Peter A. Bigot
` (8 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Defines ${BLUEZ} to be the provider of bluez services as specified by
DISTRO_FEATURES.
Example recipe fragment:
inherit bluetooth
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}
PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5"
[YOCTO #5031]
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/classes/bluetooth.bbclass | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 meta/classes/bluetooth.bbclass
diff --git a/meta/classes/bluetooth.bbclass b/meta/classes/bluetooth.bbclass
new file mode 100644
index 0000000..f88b4ae
--- /dev/null
+++ b/meta/classes/bluetooth.bbclass
@@ -0,0 +1,14 @@
+# Avoid code duplication in bluetooth-dependent recipes.
+
+# Define a variable that expands to the recipe (package) providing core
+# bluetooth support on the platform:
+# "" if bluetooth is not in DISTRO_FEATURES
+# else "bluez5" if bluez5 is in DISTRO_FEATURES
+# else "bluez4"
+
+# Use this with:
+# inherit bluetooth
+# PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}
+# PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4"
+
+BLUEZ ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '', d)}"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 03/10] packagegroup-base: select distro preference for bluez provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 01/10] bluez5: upgrade to 5.28 Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 02/10] bluetooth.bbclass: simplify recipe inference of bluetooth provider Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 04/10] pulseaudio: " Peter A. Bigot
` (7 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-core/packagegroups/packagegroup-base.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index f4b2cd5..369b63e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -8,6 +8,7 @@ PR = "r83"
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
+inherit bluetooth
PROVIDES = "${PACKAGES}"
PACKAGES = ' \
@@ -203,7 +204,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
RDEPENDS_packagegroup-base-bluetooth = "\
- bluez4 \
+ ${BLUEZ} \
${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 04/10] pulseaudio: select distro preference for bluez provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (2 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 03/10] packagegroup-base: select distro preference for bluez provider Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 05/10] qt-mobility: " Peter A. Bigot
` (6 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 99cad76..b73576e 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -12,7 +12,7 @@ DEPENDS = "libatomics-ops liboil libsamplerate0 libsndfile1 libtool"
DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
DEPENDS += "json-c gdbm speex libxml-parser-perl-native libcap"
-inherit autotools pkgconfig useradd gettext perlnative
+inherit autotools pkgconfig useradd gettext perlnative bluetooth
# *.desktop rules wont be generated during configure and build will fail
# if using --disable-nls
@@ -31,7 +31,7 @@ EXTRA_OECONF = "\
ac_cv_header_valgrind_memcheck_h=no \
"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 05/10] qt-mobility: select distro preference for bluez provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (3 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 04/10] pulseaudio: " Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 06/10] gstreamer1.0-plugins-bad: " Peter A. Bigot
` (5 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index ae1769d..b3d23d4 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -1,9 +1,11 @@
HOMEPAGE = "http://qt-project.org/"
DEPENDS = "gstreamer util-linux"
+inherit bluetooth
+
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
-PACKAGECONFIG[bluetooth] = ",,bluez4"
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG[bluez4] = ",,bluez4"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
LICENSE = "LGPLv2.1"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 06/10] gstreamer1.0-plugins-bad: select distro preference for bluez provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (4 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 05/10] qt-mobility: " Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 07/10] ofono: " Peter A. Bigot
` (4 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 6 +++---
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 9c15f2b..d9aee21 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -9,7 +9,7 @@ S = "${WORKDIR}/gst-plugins-bad-${PV}"
SRC_URI += "file://configure-allow-to-disable-libssh2.patch \
"
-inherit gettext
+inherit gettext bluetooth
# opengl packageconfig factored out to make it easy for distros
# and BSP layers to pick either (desktop) opengl, gles2, or no GL
@@ -18,7 +18,7 @@ PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2',
PACKAGECONFIG ??= " \
${PACKAGECONFIG_GL} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
orc curl uvch264 neon sndfile \
hls sbc dash bz2 smoothstreaming \
@@ -49,7 +49,7 @@ PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger"
PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
-PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4"
+PACKAGECONFIG[bluez4] = "--enable-bluez,--disable-bluez,bluez4"
PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index 75859f9..309505f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -11,7 +11,6 @@ S = "${WORKDIR}/git"
SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce"
-PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4"
PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 07/10] ofono: select distro preference for bluez provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (5 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 06/10] gstreamer1.0-plugins-bad: " Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 08/10] neard: " Peter A. Bigot
` (3 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-connectivity/ofono/ofono.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index bf44fca..70647d9 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee"
-inherit autotools pkgconfig update-rc.d systemd
+inherit autotools pkgconfig update-rc.d systemd bluetooth
DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info"
@@ -14,10 +14,10 @@ INITSCRIPT_PARAMS = "defaults 22"
PACKAGECONFIG ??= "\
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
"
PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
EXTRA_OECONF += "--enable-test"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 08/10] neard: select distro preference for bluez provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (6 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 07/10] ofono: " Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 09/10] libpcap: " Peter A. Bigot
` (2 subsequent siblings)
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-connectivity/neard/neard.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index 31bc6dd..6b6b1da 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
"
-inherit autotools pkgconfig systemd update-rc.d
+inherit autotools pkgconfig systemd update-rc.d bluetooth
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
@@ -45,7 +45,7 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
# Bluez & Wifi are not mandatory except for handover
RRECOMMENDS_${PN} = "\
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 09/10] libpcap: select distro preference for bluez provider
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (7 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 08/10] neard: " Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 18:42 ` [PATCHv3 10/10] connman: depend on distro provider of bluez Peter A. Bigot
2015-02-08 21:16 ` [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Christopher Larson
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-connectivity/libpcap/libpcap.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index a12eb16..979665c 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -10,8 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
DEPENDS = "flex-native bison-native"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+inherit bluetooth
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCHv3 10/10] connman: depend on distro provider of bluez
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (8 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 09/10] libpcap: " Peter A. Bigot
@ 2015-02-08 18:42 ` Peter A. Bigot
2015-02-08 21:16 ` [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Christopher Larson
10 siblings, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-08 18:42 UTC (permalink / raw)
To: openembedded-core
connman currently supports both bluez4 and bluez5 without distinguishing
them at configuration time.
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
meta/recipes-connectivity/connman/connman.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 736b324..bbe6059 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,6 +13,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
+inherit bluetooth
+
DEPENDS = "dbus glib-2.0 ppp iptables"
INC_PR = "r20"
@@ -32,7 +34,7 @@ EXTRA_OECONF += "\
PACKAGECONFIG ??= "wispr \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \
"
@@ -42,7 +44,7 @@ PACKAGECONFIG ??= "wispr \
PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
+PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}"
PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031
2015-02-08 18:42 [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Peter A. Bigot
` (9 preceding siblings ...)
2015-02-08 18:42 ` [PATCHv3 10/10] connman: depend on distro provider of bluez Peter A. Bigot
@ 2015-02-08 21:16 ` Christopher Larson
2015-02-10 15:43 ` Burton, Ross
10 siblings, 1 reply; 15+ messages in thread
From: Christopher Larson @ 2015-02-08 21:16 UTC (permalink / raw)
To: Peter A. Bigot; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]
On Sun, Feb 8, 2015 at 11:42 AM, Peter A. Bigot <pab@pabigot.com> wrote:
> This series has been in RFC for over two months; not that I mean to be
> impatient, but it's pretty straightforward. I've rebased it once
> more. Please give it serious consideration before some feature freeze
> means another Yocto release won't support modern Bluetooth
> infrastructure.
>
> Details from the previous submission can be found here:
>
>
> http://lists.openembedded.org/pipermail/openembedded-core/2014-November/099312.html
>
> With this all you should need to switch to bluez5 is the following in
> local.conf or some similar location:
>
> DISTRO_FEATURES_append = " bluez5"
> PREFERRED_PROVIDER_bluez-hcidump = "bluez5"
> PNBLACKLIST[bluez-hcidump] = "superseded by bluez5"
> PNBLACKLIST[gst-plugin-bluetooth] = "dropped from bluez5"
> PNBLACKLIST[bluez4] = "superseded by bluez5"
>
For what it's worth, I like the look of this series (and have since they
were first posted). Hopefully it gets merged.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1815 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031
2015-02-08 21:16 ` [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031 Christopher Larson
@ 2015-02-10 15:43 ` Burton, Ross
2015-02-10 15:55 ` Richard Purdie
2015-02-11 0:41 ` Peter A. Bigot
0 siblings, 2 replies; 15+ messages in thread
From: Burton, Ross @ 2015-02-10 15:43 UTC (permalink / raw)
To: Peter A. Bigot; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 873 bytes --]
On 8 February 2015 at 21:16, Christopher Larson <clarson@kergoth.com> wrote:
> DISTRO_FEATURES_append = " bluez5"
>> PREFERRED_PROVIDER_bluez-hcidump = "bluez5"
>> PNBLACKLIST[bluez-hcidump] = "superseded by bluez5"
>> PNBLACKLIST[gst-plugin-bluetooth] = "dropped from bluez5"
>> PNBLACKLIST[bluez4] = "superseded by bluez5"
>>
>
> For what it's worth, I like the look of this series (and have since they
> were first posted). Hopefully it gets merged.
My concern with this series is using DISTRO_FEATURES to control what
version of BlueZ is used in the image. What makes BlueZ so special that it
deserves a DISTRO_FEATURE as opposed to a PREFERRED_PROVIDER_virtual/bluez
or a variable such as BLUEZ_VERSION defined in bluetooth.bbclass?
Oh, and gst-plugins-bad has support for BlueZ5 but this series doesn't
enable it.
Ross
[-- Attachment #2: Type: text/html, Size: 1543 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031
2015-02-10 15:43 ` Burton, Ross
@ 2015-02-10 15:55 ` Richard Purdie
2015-02-11 0:41 ` Peter A. Bigot
1 sibling, 0 replies; 15+ messages in thread
From: Richard Purdie @ 2015-02-10 15:55 UTC (permalink / raw)
To: Burton, Ross; +Cc: Patches and discussions about the oe-core layer
On Tue, 2015-02-10 at 15:43 +0000, Burton, Ross wrote:
>
> On 8 February 2015 at 21:16, Christopher Larson <clarson@kergoth.com>
> wrote:
> DISTRO_FEATURES_append = " bluez5"
> PREFERRED_PROVIDER_bluez-hcidump = "bluez5"
> PNBLACKLIST[bluez-hcidump] = "superseded by
> bluez5"
> PNBLACKLIST[gst-plugin-bluetooth] = "dropped from
> bluez5"
> PNBLACKLIST[bluez4] = "superseded by bluez5"
>
> For what it's worth, I like the look of this series (and have
> since they were first posted). Hopefully it gets merged.
>
> My concern with this series is using DISTRO_FEATURES to control what
> version of BlueZ is used in the image. What makes BlueZ so special
> that it deserves a DISTRO_FEATURE as opposed to a
> PREFERRED_PROVIDER_virtual/bluez or a variable such as BLUEZ_VERSION
> defined in bluetooth.bbclass?
I think that concern has been holding this up for a while but I don't
see a good way to avoid it. I'd observe that:
* DISTRO_FEATURES was created to have a common place to enable/disable
things rather than individual variables
* There is precedent for package specific issues in DISTRO_FEATURES
(e.g. libc)
* PREFERRED_PROVIDER is not a good match for this problem as the
providers are not identical, or a drop in replacement, far from it.
So whilst I understand the concern I think we have to move past that
based on the above.
Cheers,
Richard
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv3 00/10] bluez4/bluez5 selection fixing Yocto 5031
2015-02-10 15:43 ` Burton, Ross
2015-02-10 15:55 ` Richard Purdie
@ 2015-02-11 0:41 ` Peter A. Bigot
1 sibling, 0 replies; 15+ messages in thread
From: Peter A. Bigot @ 2015-02-11 0:41 UTC (permalink / raw)
To: Burton, Ross; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
On 02/10/2015 09:43 AM, Burton, Ross wrote:
>
> On 8 February 2015 at 21:16, Christopher Larson <clarson@kergoth.com
> <mailto:clarson@kergoth.com>> wrote:
>
> DISTRO_FEATURES_append = " bluez5"
> PREFERRED_PROVIDER_bluez-hcidump = "bluez5"
> PNBLACKLIST[bluez-hcidump] = "superseded by bluez5"
> PNBLACKLIST[gst-plugin-bluetooth] = "dropped from bluez5"
> PNBLACKLIST[bluez4] = "superseded by bluez5"
>
>
> For what it's worth, I like the look of this series (and have
> since they were first posted). Hopefully it gets merged.
>
>
> My concern with this series is using DISTRO_FEATURES to control what
> version of BlueZ is used in the image. What makes BlueZ so special
> that it deserves a DISTRO_FEATURE as opposed to a
> PREFERRED_PROVIDER_virtual/bluez or a variable such as BLUEZ_VERSION
> defined in bluetooth.bbclass?
Tried that first pass; I'll defer to RP and the list archives for the
rationale.
>
> Oh, and gst-plugins-bad has support for BlueZ5 but this series doesn't
> enable it.
I saw no sign of such support when I started back in November, and
though the gst-plugins-bad master branch does have it now it looks like
the package would have to be updated from 0.10.23 to enable it. IMO
that's out of scope. My intent with this series is to make it possible
to use bluez5 at all, not to make sure that every package that might
work with bluez5 has support enabled. That's best left to people who
have the hardware/use-cases that allow such a configuration to be validated.
Peter
[-- Attachment #2: Type: text/html, Size: 3307 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread