update meta-oe to support proposed bluez5 approach
v2 cover update meta-oe to support proposed bluez5 approach
These are the meta-oe patches corresponding to the RFC solution to selecting bluez5 as bluetooth provider submitted at:
http://lists.openembedded.org/pipermail/openembedded-core/2014-November/099312.html
The following changes since commit 34be57e7454ffe5f591cc0d7638bf41bb4377a61:
meta-networking: update LAYERDEPENDS (2014-11-24 14:12:02 -0500)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib pabigot/rfc-v2/bluez5
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=pabigot/rfc-v2/bluez5
Peter A. Bigot (3):
gnokii: refine selector for bluez4 package config
gpsd: select distro preference for bluez provider
packagegroup-basic: select distro preference for bluez provider
meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb | 2 +- meta-oe/recipes-core/packagegroups/packagegroup-basic.bb | 3 ++- meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-)
Signature · 1 line
1.8.5.5
RFC v2 1/3 gnokii: refine selector for bluez4 package config
Use bluez4 or bluez5 to avoid ambiguity.
--- meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +1 -1
@@ -9,7 +9,7 @@ DEPENDS = "glib-2.0" X11DEPENDS = " libxpm gtk+" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG[bluez] = "--enable-bluetooth,--disable-bluetooth,bluez4" +PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
Signature · 1 line
1.8.5.5
RFC v2 2/3 gpsd: select distro preference for bluez provider
In reply to Peter A. Bigot--- meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb +3 -3
@@ -20,7 +20,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "fc5b03aae38b9b5b6880b31924d0ace3" SRC_URI[sha256sum] = "706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320" -inherit scons update-rc.d python-dir pythonnative systemd +inherit scons update-rc.d python-dir pythonnative systemd bluetooth INITSCRIPT_NAME = "gpsd" INITSCRIPT_PARAMS = "defaults 35"
@@ -30,8 +30,8 @@ SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false export STAGING_INCDIR export STAGING_LIBDIR -PACKAGECONFIG ??= "bluez" -PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez4" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" +PACKAGECONFIG[bluez4] = "bluez='true',bluez='false',bluez4" EXTRA_OESCONS = " \ sysroot=${STAGING_DIR_TARGET} \
Signature · 1 line
1.8.5.5
RFC v2 3/3 packagegroup-basic: select distro preference for bluez provider
In reply to Peter A. Bigot--- meta-oe/recipes-core/packagegroups/packagegroup-basic.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb +2 -1
@@ -9,6 +9,7 @@ PR = "r13" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup +inherit bluetooth # Poke extra recomendations into the list using your machine.conf #
@@ -45,7 +46,7 @@ RRECOMMENDS_${PN} = "\ ${@base_contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \ ${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ \ - ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}", "", d)} \ ${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \ \ tzdata \
Signature · 1 line
1.8.5.5