summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-01-22 12:53:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 16:48:08 (GMT)
commit29343ac7b2d2347a363b908bee5d040c818d066c (patch)
treef4a252395e13ffbed2b6308a32dff8951b59f551 /meta/recipes-connectivity/connman
parenteaec1c422bf974c31a73ad71f309bd0738c632fb (diff)
downloadpoky-29343ac7b2d2347a363b908bee5d040c818d066c.tar.gz
connman: add PACKAGECONFIG for the commandline client
The client depends on readline which is GPLv3. Add a PACKAGECONFIG so users who don't need the client and are against GPLv3 can disable it. Also remove the explicit installation of the client in do_install_append, as the Makefile installs it now. (From OE-Core rev: 84b082be0a879153d9af8e093b6823d49c2621b8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ff3aff5..d3eeb3b 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
15 15
16inherit autotools pkgconfig systemd update-rc.d update-alternatives 16inherit autotools pkgconfig systemd update-rc.d update-alternatives
17 17
18DEPENDS = "dbus glib-2.0 ppp readline" 18DEPENDS = "dbus glib-2.0 ppp"
19 19
20INC_PR = "r20" 20INC_PR = "r20"
21 21
@@ -27,13 +27,11 @@ EXTRA_OECONF += "\
27 --enable-ethernet \ 27 --enable-ethernet \
28 --enable-tools \ 28 --enable-tools \
29 --disable-polkit \ 29 --disable-polkit \
30 --enable-client \
31" 30"
32 31
33PACKAGECONFIG ??= "wispr \ 32PACKAGECONFIG ??= "wispr iptables client\
34 ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \ 33 ${@bb.utils.filter('DISTRO_FEATURES', '3g systemd wifi', d)} \
35 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
36 iptables \
37" 35"
38 36
39# If you want ConnMan to support VPN, add following statement into 37# If you want ConnMan to support VPN, add following statement into
@@ -54,6 +52,7 @@ PACKAGECONFIG[wispr] = "--enable-wispr,--disable-wispr,gnutls,"
54PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-masq-ipv4 kernel-module-nft-nat" 52PACKAGECONFIG[nftables] = "--with-firewall=nftables ,,libmnl libnftnl,,kernel-module-nf-tables kernel-module-nft-chain-nat-ipv4 kernel-module-nft-chain-route-ipv4 kernel-module-nft-masq-ipv4 kernel-module-nft-nat"
55PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables" 53PACKAGECONFIG[iptables] = "--with-firewall=iptables ,,iptables,iptables"
56PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard" 54PACKAGECONFIG[nfc] = "--enable-neard, --disable-neard, neard, neard"
55PACKAGECONFIG[client] = "--enable-client,--disable-client,readline"
57 56
58INITSCRIPT_NAME = "connman" 57INITSCRIPT_NAME = "connman"
59INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 58INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
@@ -87,7 +86,6 @@ do_install_append() {
87 if [ -e ${B}/tools/wispr ]; then 86 if [ -e ${B}/tools/wispr ]; then
88 install -m 0755 ${B}/tools/wispr ${D}${bindir} 87 install -m 0755 ${B}/tools/wispr ${D}${bindir}
89 fi 88 fi
90 install -m 0755 ${B}/client/connmanctl ${D}${bindir}
91 89
92 # We don't need to package an empty directory 90 # We don't need to package an empty directory
93 rmdir --ignore-fail-on-non-empty ${D}${libdir}/connman/scripts 91 rmdir --ignore-fail-on-non-empty ${D}${libdir}/connman/scripts