connman: use PACKAGECONFIG to control readline/client option
PATCH 1/1 connman: use PACKAGECONFIG to control readline/client option
Only depend on readline when enabling the client, like bluez5. Default to enable readline and compile the client as before.
Signed-off-by Claus Stovgaard <[email protected]>
--- meta/recipes-connectivity/connman/connman.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
meta/recipes-connectivity/connman/connman.inc +6 -3
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ inherit autotools pkgconfig systemd update-rc.d update-alternatives -DEPENDS = "dbus glib-2.0 ppp readline" +DEPENDS = "dbus glib-2.0 ppp" INC_PR = "r20"
@@ -27,13 +27,13 @@ EXTRA_OECONF += "\ --enable-ethernet \ --enable-tools \ --disable-polkit \ - --enable-client \ " PACKAGECONFIG ??= "wispr \ ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ iptables \ + readline \ " # If you want ConnMan to support VPN, add following statement into
@@ -54,6 +54,7 @@ PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls," PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables-ipv4 kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-meta kernel-module-nft-masq-ipv4 kernel-module-nft-nat" PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard" +PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline" INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
@@ -87,7 +88,9 @@ do_install_append() { if [ -e ${B}/tools/wispr ]; then install -m 0755 ${B}/tools/wispr ${D}${bindir} fi - install -m 0755 ${B}/client/connmanctl ${D}${bindir} + if [ -e ${B}/client/connmanctl ]; then + install -m 0755 ${B}/client/connmanctl ${D}${bindir} + fi # We don't need to package an empty directory rmdir --ignore-fail-on-non-empty ${D}${libdir}/connman/scripts
Signature · 1 line
2.23.0