[oe-commits] Otavio Salvador : connman: improve packaging
git at git.openembedded.org
git at git.openembedded.org
Tue Dec 13 12:32:58 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 6f9594cddefe74ce7381e4fa2a68cb8a542d6d2e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6f9594cddefe74ce7381e4fa2a68cb8a542d6d2e
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Tue Dec 13 10:41:14 2011 +0000
connman: improve packaging
The scripts being included on connman-scripts was the test utility and
thus we are moving them with the rest of test utilities in
'connman-tests'. A runtime dependency on python-dbus were missing as
well as those scripts uses it.
As no dhclient, resolvconf and udhcpc plugins are being generated the
respective dependency map entries were also removed.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-connectivity/connman/connman.inc | 14 ++++++--------
meta/recipes-connectivity/connman/connman_0.78.bb | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 503bf1c..bb1b279 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -68,16 +68,16 @@ do_install_append() {
install -d ${D}${bindir}
install -m 0755 ${S}/tools/*-test ${D}${bindir}
install -m 0755 ${S}/tools/wispr ${D}${bindir}
+
+ # We don't need to package an empty directory
+ rmdir ${D}${libdir}/connman/scripts
}
PACKAGES_DYNAMIC = "${PN}-plugin-*"
python populate_packages_prepend() {
depmap = dict( pppd="ppp",
- udhcp="busybox connman-scripts",
- dhclient="dhcp-client",
wifi="wpa-supplicant",
- resolvconf="resolvconf",
bluetooth="bluez4",
ofono="ofono" )
packages = []
@@ -94,14 +94,12 @@ python populate_packages_prepend() {
d.setVar("RDEPENDS_%s" % package, " ".join(rdepends))
}
-PACKAGES =+ "${PN}-scripts ${PN}-tools ${PN}-tests"
+PACKAGES =+ "${PN}-tools ${PN}-tests"
FILES_${PN}-tools = "${bindir}/wispr"
-FILES_${PN}-tests = "${bindir}/*-test"
-
-FILES_${PN}-scripts += "${libdir}/${PN}/test/* ${libdir}/connman/scripts"
-RDEPENDS_${PN}-scripts = "python"
+FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${PN}/test/*"
+RDEPENDS_${PN}-tests = "python-dbus"
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
index f36f670..74c102b 100644
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -1,6 +1,6 @@
require connman.inc
-PR = "r4"
+PR = "r5"
# 0.78 tag
SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"
More information about the Openembedded-commits
mailing list