[PATCHv3 0/8] bluez: upgrade and refactoring

[PATCHv3 0/8] bluez: upgrade and refactoring

[Marc Ferland]

V3:
* shell functions use tabs not spaces (as pointed by Khem Raj)

V2:
This patch series:

* upgrades to version 5.44
* renames variables and configure options to better reflect bluez options
* adds midi, cups and systemd as PACKAGECONFIG options
* removes references from files that are no longer part of bluez
* cleanups tabs/spaces usage

Please drop the changes from my previous patch:
https://patchwork.openembedded.org/patch/138995/

Regards,

Marc Ferland (8):
  bluez5: Upgrade 5.43 -> 5.44
  bluez5: remove libasound-module references
  bluez5: add PACKAGECONFIG option for midi
  bluez5: add PACKAGECONFIG option for systemd
  bluez5: add PACKAGECONFIG option for cups
  bluez5: do not install audio.conf
  bluez5: cleanup tabs and spaces
  bluez5: rename "readline" config option to "client"

 meta/recipes-connectivity/bluez5/bluez5.inc     | 66 ++++++++++++------------
 meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 --------------------
 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 +++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 87 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb

-- 
2.7.4

[PATCHv3 1/8] bluez5: Upgrade 5.43 -> 5.44

[Marc Ferland]

New feautures/fixes in this version:

* fixes to BLE
* a new midi plugin
* support for single-mode controllers w/o public address
* most of the experimental tools have been promoted and are now part of
  the official tools
* 'experimental' has been renamed to 'testing' (hence the addition of
  the 'testing' package config option)
* classic command line tools like hciattach and hciconfig are now enabled
  by the "--enable-deprecated" configure option (enabled by default for
  backward compatibility).

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
 meta/recipes-connectivity/bluez5/bluez5.inc     |  9 ++--
 meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 --------------------
 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 +++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 58 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb
 create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index ed75db2..11cf8fb 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4"
 
 PACKAGECONFIG ??= "obex-profiles readline"
 PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
-PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
 PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
+PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
 
 SRC_URI = "\
     ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
 
 EXTRA_OECONF = "\
   --enable-tools \
+  --enable-deprecated \
   --disable-cups \
   --enable-test \
   --enable-datafiles \
@@ -41,10 +42,12 @@ EXTRA_OECONF = "\
 # bluez5 builds a large number of useful utilities but does not
 # install them.  Specify which ones we want put into ${PN}-noinst-tools.
 NOINST_TOOLS_READLINE ??= ""
-NOINST_TOOLS_EXPERIMENTAL ??= ""
+NOINST_TOOLS_TESTING ??= ""
+NOINST_TOOLS_BT ??= ""
 NOINST_TOOLS = " \
     ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \
+    ${NOINST_TOOLS_BT} \
 "
 
 do_install_append() {
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.43.bb
deleted file mode 100644
index e10b82d..0000000
--- a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-require bluez5.inc
-
-REQUIRED_DISTRO_FEATURES = "bluez5"
-
-SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350"
-SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15"
-
-# noinst programs in Makefile.tools that are conditional on READLINE
-# support
-NOINST_TOOLS_READLINE ?= " \
-    attrib/gatttool \
-    tools/obex-client-tool \
-    tools/obex-server-tool \
-    tools/bluetooth-player \
-    tools/obexctl \
-    tools/btmgmt \
-"
-
-# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL
-# support
-NOINST_TOOLS_EXPERIMENTAL ?= " \
-    emulator/btvirt \
-    emulator/b1ee \
-    emulator/hfp \
-    tools/3dsp \
-    tools/mgmt-tester \
-    tools/gap-tester \
-    tools/l2cap-tester \
-    tools/sco-tester \
-    tools/smp-tester \
-    tools/hci-tester \
-    tools/rfcomm-tester \
-    tools/bdaddr \
-    tools/avinfo \
-    tools/avtest \
-    tools/scotest \
-    tools/amptest \
-    tools/hwdb \
-    tools/hcieventmask \
-    tools/hcisecfilter \
-    tools/btinfo \
-    tools/btattach \
-    tools/btsnoop \
-    tools/btproxy \
-    tools/btiotest \
-    tools/mcaptest \
-    tools/cltest \
-    tools/oobtest \
-    tools/seq2bseq \
-    tools/ibeacon \
-    tools/btgatt-client \
-    tools/btgatt-server \
-    tools/gatt-service \
-    profiles/iap/iapd \
-"
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
new file mode 100644
index 0000000..1095f88
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
@@ -0,0 +1,68 @@
+require bluez5.inc
+
+REQUIRED_DISTRO_FEATURES = "bluez5"
+
+SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c"
+SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85"
+
+# noinst programs in Makefile.tools that are conditional on READLINE
+# support
+NOINST_TOOLS_READLINE ?= " \
+    attrib/gatttool \
+    tools/obex-client-tool \
+    tools/obex-server-tool \
+    tools/bluetooth-player \
+    tools/obexctl \
+    tools/btmgmt \
+"
+
+# noinst programs in Makefile.tools that are conditional on TESTING
+# support
+NOINST_TOOLS_TESTING ?= " \
+    emulator/btvirt \
+    emulator/b1ee \
+    emulator/hfp \
+    peripheral/btsensor \
+    tools/3dsp \
+    tools/mgmt-tester \
+    tools/gap-tester \
+    tools/l2cap-tester \
+    tools/sco-tester \
+    tools/smp-tester \
+    tools/hci-tester \
+    tools/rfcomm-tester \
+    tools/bnep-tester \
+    tools/userchan-tester \
+"
+
+# noinst programs in Makefile.tools that are conditional on TOOLS
+# support
+NOINST_TOOLS_BT ?= " \
+    tools/bdaddr \
+    tools/avinfo \
+    tools/avtest \
+    tools/scotest \
+    tools/amptest \
+    tools/hwdb \
+    tools/hcieventmask \
+    tools/hcisecfilter \
+    tools/btinfo \
+    tools/btsnoop \
+    tools/btproxy \
+    tools/btiotest \
+    tools/bneptest \
+    tools/mcaptest \
+    tools/cltest \
+    tools/oobtest \
+    tools/seq2bseq \
+    tools/nokfw \
+    tools/create-image \
+    tools/eddystone \
+    tools/ibeacon \
+    tools/btgatt-client \
+    tools/btgatt-server \
+    tools/test-runner \
+    tools/check-selftest \
+    tools/gatt-service \
+    profiles/iap/iapd \
+"
-- 
2.7.4

[PATCHv3 2/8] bluez5: remove libasound-module references

[Marc Ferland]

Cleanup references to libasound-module since this code has been
completly removed from Bluez.

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 11cf8fb..4244fc8 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -79,14 +79,11 @@ do_install_append() {
         sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
 }
 
-ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
+PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
 
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
 FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
-  ${libdir}/alsa-lib/*.la \
 "
 
 FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
-- 
2.7.4

Re: [PATCHv3 2/8] bluez5: remove libasound-module references

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

On 18 April 2017 at 14:20, Marc Ferland <ferlandm@amotus.ca> wrote:

> -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex
> ${PN}-noinst-tools"
> +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
>

packagegroup-base still refers to this package though:

  - nothing provides libasound-module-bluez needed by
packagegroup-base-bluetooth-1.0-r83.0.qemux86_64

Ross

[-- Attachment #2: Type: text/html, Size: 1002 bytes --]

Re: [PATCHv3 2/8] bluez5: remove libasound-module references

[Marc Ferland]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

Noted. Thanks for the input.
Marc

On Fri, Apr 21, 2017 at 11:33 AM, Burton, Ross <ross.burton@intel.com>
wrote:

>
> On 18 April 2017 at 14:20, Marc Ferland <ferlandm@amotus.ca> wrote:
>
>> -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex
>> ${PN}-noinst-tools"
>> +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
>>
>
> packagegroup-base still refers to this package though:
>
>   - nothing provides libasound-module-bluez needed by
> packagegroup-base-bluetooth-1.0-r83.0.qemux86_64
>
> Ross
>

[-- Attachment #2: Type: text/html, Size: 1624 bytes --]

[PATCHv3 3/8] bluez5: add PACKAGECONFIG option for midi

[Marc Ferland]

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 4244fc8..687656e 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -16,6 +16,7 @@ PACKAGECONFIG ??= "obex-profiles readline"
 PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
 PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
 PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
+PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
 
 SRC_URI = "\
     ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
-- 
2.7.4

[PATCHv3 4/8] bluez5: add PACKAGECONFIG option for systemd

[Marc Ferland]

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 687656e..71a5016 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump"
 
 RCONFLICTS_${PN} = "bluez4"
 
-PACKAGECONFIG ??= "obex-profiles readline"
+PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
 PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
 PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
 PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
 
 SRC_URI = "\
     ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -36,7 +37,6 @@ EXTRA_OECONF = "\
   --disable-cups \
   --enable-test \
   --enable-datafiles \
-  ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \
   --enable-library \
 "
 
-- 
2.7.4

[PATCHv3 5/8] bluez5: add PACKAGECONFIG option for cups

[Marc Ferland]

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 71a5016..c8a240f 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -18,6 +18,7 @@ PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
 PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
 PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
 PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
+PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups"
 
 SRC_URI = "\
     ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -34,7 +35,6 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
 EXTRA_OECONF = "\
   --enable-tools \
   --enable-deprecated \
-  --disable-cups \
   --enable-test \
   --enable-datafiles \
   --enable-library \
@@ -82,7 +82,11 @@ do_install_append() {
 
 PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
 
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
+FILES_${PN} += " \
+    ${libdir}/bluetooth/plugins/*.so \
+    ${systemd_unitdir}/ ${datadir}/dbus-1 \
+    ${libdir}/cups \
+"
 FILES_${PN}-dev += "\
   ${libdir}/bluetooth/plugins/*.la \
 "
-- 
2.7.4

[PATCHv3 6/8] bluez5: do not install audio.conf

[Marc Ferland]

The audio.conf file has been removed, stop installing it.

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
 meta/recipes-connectivity/bluez5/bluez5.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index c8a240f..47d8f22 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -56,9 +56,6 @@ do_install_append() {
 	install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
 
 	install -d ${D}${sysconfdir}/bluetooth/
-	if [ -f ${S}/profiles/audio/audio.conf ]; then
-	    install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
-	fi
 	if [ -f ${S}/profiles/network/network.conf ]; then
 	    install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
 	fi
-- 
2.7.4

[PATCHv3 7/8] bluez5: cleanup tabs and spaces

[Marc Ferland]

---
 meta/recipes-connectivity/bluez5/bluez5.inc | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 47d8f22..01ade7d 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -57,24 +57,24 @@ do_install_append() {
 
 	install -d ${D}${sysconfdir}/bluetooth/
 	if [ -f ${S}/profiles/network/network.conf ]; then
-	    install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
+		install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
 	fi
 	if [ -f ${S}/profiles/input/input.conf ]; then
-	    install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
+		install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
 	fi
 
-  if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
-    sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
-  fi
+	if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
+		sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
+	fi
 
 	# Install desired tools that upstream leaves in build area
-        for f in ${NOINST_TOOLS} ; do
-	    install -m 755 ${B}/$f ${D}/${bindir}
+	for f in ${NOINST_TOOLS} ; do
+		install -m 755 ${B}/$f ${D}/${bindir}
 	done
 
-        # Patch python tools to use Python 3; they should be source compatible, but
-        # still refer to Python 2 in the shebang
-        sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
+	# Patch python tools to use Python 3; they should be source compatible, but
+	# still refer to Python 2 in the shebang
+	sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
 }
 
 PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
@@ -84,8 +84,8 @@ FILES_${PN} += " \
     ${systemd_unitdir}/ ${datadir}/dbus-1 \
     ${libdir}/cups \
 "
-FILES_${PN}-dev += "\
-  ${libdir}/bluetooth/plugins/*.la \
+FILES_${PN}-dev += " \
+    ${libdir}/bluetooth/plugins/*.la \
 "
 
 FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
@@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth"
 EXCLUDE_FROM_WORLD = "1"
 
 do_compile_ptest() {
-        oe_runmake buildtests
+	oe_runmake buildtests
 }
 
 do_install_ptest() {
-        cp -r ${B}/unit/ ${D}${PTEST_PATH}
-        rm -f ${D}${PTEST_PATH}/unit/*.o
+	cp -r ${B}/unit/ ${D}${PTEST_PATH}
+	rm -f ${D}${PTEST_PATH}/unit/*.o
 }
-- 
2.7.4

Re: [PATCHv3 7/8] bluez5: cleanup tabs and spaces

[Marc Ferland]

[-- Attachment #1: Type: text/plain, Size: 3097 bytes --]

On Tue, Apr 18, 2017 at 9:20 AM, Marc Ferland <ferlandm@amotus.ca> wrote:

> ---
>  meta/recipes-connectivity/bluez5/bluez5.inc | 30
> ++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc
> b/meta/recipes-connectivity/bluez5/bluez5.inc
> index 47d8f22..01ade7d 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5.inc
> +++ b/meta/recipes-connectivity/bluez5/bluez5.inc
> @@ -57,24 +57,24 @@ do_install_append() {
>
>         install -d ${D}${sysconfdir}/bluetooth/
>         if [ -f ${S}/profiles/network/network.conf ]; then
> -           install -m 0644 ${S}/profiles/network/network.conf
> ${D}/${sysconfdir}/bluetooth/
> +               install -m 0644 ${S}/profiles/network/network.conf
> ${D}/${sysconfdir}/bluetooth/
>         fi
>         if [ -f ${S}/profiles/input/input.conf ]; then
> -           install -m 0644 ${S}/profiles/input/input.conf
> ${D}/${sysconfdir}/bluetooth/
> +               install -m 0644 ${S}/profiles/input/input.conf
> ${D}/${sysconfdir}/bluetooth/
>         fi
>
> -  if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
> -    sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/
> bluetooth
> -  fi
> +       if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
> +               sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g'
> ${D}/${sysconfdir}/init.d/bluetooth
> +       fi
>
>         # Install desired tools that upstream leaves in build area
> -        for f in ${NOINST_TOOLS} ; do
> -           install -m 755 ${B}/$f ${D}/${bindir}
> +       for f in ${NOINST_TOOLS} ; do
> +               install -m 755 ${B}/$f ${D}/${bindir}
>         done
>
> -        # Patch python tools to use Python 3; they should be source
> compatible, but
> -        # still refer to Python 2 in the shebang
> -        sed -i -e '1s,#!.*python.*,#!${bindir}/python3,'
> ${D}${libdir}/bluez/test/*
> +       # Patch python tools to use Python 3; they should be source
> compatible, but
> +       # still refer to Python 2 in the shebang
> +       sed -i -e '1s,#!.*python.*,#!${bindir}/python3,'
> ${D}${libdir}/bluez/test/*
>  }
>
>  PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
> @@ -84,8 +84,8 @@ FILES_${PN} += " \
>      ${systemd_unitdir}/ ${datadir}/dbus-1 \
>      ${libdir}/cups \
>  "
> -FILES_${PN}-dev += "\
> -  ${libdir}/bluetooth/plugins/*.la \
> +FILES_${PN}-dev += " \
> +    ${libdir}/bluetooth/plugins/*.la \
>  "
>
>  FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
> @@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth"
>  EXCLUDE_FROM_WORLD = "1"
>
>  do_compile_ptest() {
> -        oe_runmake buildtests
> +       oe_runmake buildtests
>  }
>
>  do_install_ptest() {
> -        cp -r ${B}/unit/ ${D}${PTEST_PATH}
> -        rm -f ${D}${PTEST_PATH}/unit/*.o
> +       cp -r ${B}/unit/ ${D}${PTEST_PATH}
> +       rm -f ${D}${PTEST_PATH}/unit/*.o
>  }
> --
> 2.7.4
>
>
Oops my bad:

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>

[-- Attachment #2: Type: text/html, Size: 3977 bytes --]

[PATCHv3 8/8] bluez5: rename "readline" config option to "client"

[Marc Ferland]

The configure option is "enable-client" not "enable-readline" (the
latter does exists and is automatically enabled when enable-client is
passed).

Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
 meta/recipes-connectivity/bluez5/bluez5.inc     | 8 ++++----
 meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 01ade7d..0485343 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -12,9 +12,9 @@ RPROVIDES_${PN} += "bluez-hcidump"
 
 RCONFLICTS_${PN} = "bluez4"
 
-PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG ??= "obex-profiles client ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
-PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
+PACKAGECONFIG[client] = "--enable-client,--disable-client,readline,"
 PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
 PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
 PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
@@ -42,11 +42,11 @@ EXTRA_OECONF = "\
 
 # bluez5 builds a large number of useful utilities but does not
 # install them.  Specify which ones we want put into ${PN}-noinst-tools.
-NOINST_TOOLS_READLINE ??= ""
+NOINST_TOOLS_CLIENT ??= ""
 NOINST_TOOLS_TESTING ??= ""
 NOINST_TOOLS_BT ??= ""
 NOINST_TOOLS = " \
-    ${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'client', '${NOINST_TOOLS_CLIENT}', '', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \
     ${NOINST_TOOLS_BT} \
 "
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
index 1095f88..5cb44fc 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
@@ -5,9 +5,9 @@ REQUIRED_DISTRO_FEATURES = "bluez5"
 SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c"
 SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85"
 
-# noinst programs in Makefile.tools that are conditional on READLINE
+# noinst programs in Makefile.tools that are conditional on CLIENT
 # support
-NOINST_TOOLS_READLINE ?= " \
+NOINST_TOOLS_CLIENT ?= " \
     attrib/gatttool \
     tools/obex-client-tool \
     tools/obex-server-tool \
-- 
2.7.4

Re: [PATCHv3 8/8] bluez5: rename "readline" config option to "client"

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

On 18 April 2017 at 14:20, Marc Ferland <ferlandm@amotus.ca> wrote:

> The configure option is "enable-client" not "enable-readline" (the
> latter does exists and is automatically enabled when enable-client is
> passed).
>

The point of this was to remove dependencies on the GPLv3 readline library,
so this explicitly is readline-using-clients not all clients.

Ross

[-- Attachment #2: Type: text/html, Size: 807 bytes --]

Re: [PATCHv3 8/8] bluez5: rename "readline" config option to "client"

[Marc Ferland]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

On Tue, Apr 18, 2017 at 10:14 AM, Burton, Ross <ross.burton@intel.com>
wrote:

>
> On 18 April 2017 at 14:20, Marc Ferland <ferlandm@amotus.ca> wrote:
>
>> The configure option is "enable-client" not "enable-readline" (the
>> latter does exists and is automatically enabled when enable-client is
>> passed).
>>
>
> The point of this was to remove dependencies on the GPLv3 readline
> library, so this explicitly is readline-using-clients not all clients.
>
> Ross
>

Did not see that, will fix in next version.

[-- Attachment #2: Type: text/html, Size: 1425 bytes --]

✗ patchtest: failure for bluez: upgrade and refactoring (rev2)

[Patchwork]

== Series Details ==

Series: bluez: upgrade and refactoring (rev2)
Revision: 2
URL   : https://patchwork.openembedded.org/series/6387/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Patch            [v3,7/8] bluez5: cleanup tabs and spaces
 Issue             Patch is missing Signed-off-by [test_signed_off_by_presence] 
  Suggested fix    Sign off the patch (either manually or with "git commit --amend -s")



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe