From e8636471d26edce61803b004118b5cce13eaa9aa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 13 Jul 2011 09:52:45 +0200 Subject: connman: update to 0.75 Signed-off-by: Koen Kooi --- meta-oe/recipes-connectivity/connman/connman.inc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'meta-oe/recipes-connectivity/connman/connman.inc') diff --git a/meta-oe/recipes-connectivity/connman/connman.inc b/meta-oe/recipes-connectivity/connman/connman.inc index c0cdf7b4ce..1022ce700e 100644 --- a/meta-oe/recipes-connectivity/connman/connman.inc +++ b/meta-oe/recipes-connectivity/connman/connman.inc @@ -43,10 +43,15 @@ do_compile_append() { do_install_append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman + + install -d ${D}${bindir} + install -m 0755 ${S}/tools/*-test ${D}${bindir} + install -m 0755 ${S}/tools/wispr ${D}${bindir} + install -m 0755 ${S}/tools/wifi-scan ${D}${bindir} } python populate_packages_prepend() { - depmap = dict( pppd="ppp", udhcp="busybox connman-scripts", dhclient="dhcp-client", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4", ntpd="ntp" ) + depmap = dict( pppd="ppp", udhcp="busybox connman-scripts", dhclient="dhcp-client", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4", ntpd="ntp", ofono="ofono" ) packages = [] hook = lambda file,pkg,b,c,d:packages.append((file,pkg)) plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) @@ -62,8 +67,10 @@ python populate_packages_prepend() { PACKAGES_DYNAMIC = "${PN}-plugin-*" -PACKAGES += "${PN}-scripts ${PN}-test-utils" +PACKAGES =+ "${PN}-scripts ${PN}-tools ${PN}-tests" +FILES_${PN}-tools = "${bindir}/wispr ${bindir}/wifi-scan" +FILES_${PN{-tests = "${bindir}/*-test" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ @@ -97,8 +104,6 @@ pkg_postrm_connman-systemd() { # Needed when using DNS proxy feature RRECOMMENDS_${PN} += "dnsmasq-dbus" -FILES_${PN}-test-utils += "${libdir}/connman/test/*" - FILES_${PN}-scripts += "${libdir}/connman/scripts" FILES_${PN}-dbg += "${libdir}/connman/*/.debug" FILES_${PN}-dev += "${libdir}/connman/*/*.la" -- cgit v1.2.3-54-g00ecf