summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-02-26 18:56:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:15:48 +0000
commitd1e1f198164d0dca32428f8023ca47ebc644ba55 (patch)
tree9d40acc5f6744f638132f06702081d5f868224e2 /meta/recipes-connectivity
parent399ca5da8c4ff7e62e13c82b1dc82e80a56fce37 (diff)
downloadpoky-d1e1f198164d0dca32428f8023ca47ebc644ba55.tar.gz
connman: enable connman client
connmanctl is available in a new package: connman-client (From OE-Core rev: d926de687ba45fed993af7feba8574b76293b939) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index b61e2afd26..db4d26c3a8 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r17" 23INC_PR = "r18"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_powerpc = ""
@@ -38,7 +38,7 @@ EXTRA_OECONF += "\
38 --enable-tools \ 38 --enable-tools \
39 --enable-test \ 39 --enable-test \
40 --disable-polkit \ 40 --disable-polkit \
41 --disable-client \ 41 --enable-client \
42 --enable-fake \ 42 --enable-fake \
43 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '', d)} \ 43 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '', d)} \
44" 44"
@@ -73,6 +73,7 @@ do_install_append() {
73 install -d ${D}${bindir} 73 install -d ${D}${bindir}
74 install -m 0755 ${S}/tools/*-test ${D}${bindir} 74 install -m 0755 ${S}/tools/*-test ${D}${bindir}
75 install -m 0755 ${S}/tools/wispr ${D}${bindir} 75 install -m 0755 ${S}/tools/wispr ${D}${bindir}
76 install -m 0755 ${B}/client/connmanctl ${D}${bindir}
76 77
77 # We don't need to package an empty directory 78 # We don't need to package an empty directory
78 rmdir ${D}${libdir}/connman/scripts 79 rmdir ${D}${libdir}/connman/scripts
@@ -116,13 +117,15 @@ python populate_packages_prepend() {
116 d.setVar("RDEPENDS_%s" % package, " ".join(rdepends)) 117 d.setVar("RDEPENDS_%s" % package, " ".join(rdepends))
117} 118}
118 119
119PACKAGES =+ "${PN}-tools ${PN}-tests" 120PACKAGES =+ "${PN}-tools ${PN}-tests ${PN}-client"
120 121
121FILES_${PN}-tools = "${bindir}/wispr" 122FILES_${PN}-tools = "${bindir}/wispr"
122 123
123FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*" 124FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*"
124RDEPENDS_${PN}-tests = "python-dbus python-pygobject python-textutils python-subprocess python-fcntl python-netclient" 125RDEPENDS_${PN}-tests = "python-dbus python-pygobject python-textutils python-subprocess python-fcntl python-netclient"
125 126
127FILES_${PN}-client = "${bindir}/connmanctl"
128
126FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ 129FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
127 ${libdir}/connman/plugins \ 130 ${libdir}/connman/plugins \
128 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 131 ${sysconfdir} ${sharedstatedir} ${localstatedir} \