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

Marc Ferland ferlandm at amotus.ca
Tue Apr 18 13:20:09 UTC 2017


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 at 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




More information about the Openembedded-core mailing list