Patchwork [10/12] connman: split scripts into separate package

login
register
mail settings
Submitter Joshua Lock
Date Nov. 8, 2011, 12:10 a.m.
Message ID <f0de6470dfb84e7939234cd516cd1a340bd71588.1320709417.git.josh@linux.intel.com>
Download mbox | patch
Permalink /patch/14473/
State Accepted
Commit 281510acd0ee3221dd804d7d9de567be2be675f4
Headers show

Comments

Joshua Lock - Nov. 8, 2011, 12:10 a.m.
The connman scripts are useless without a Python interpreter so split
them into a separate package and add Python to its RDEPENDS.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-connectivity/connman/connman.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Koen Kooi - Nov. 8, 2011, 2:17 p.m.
Op 8 nov. 2011, om 01:10 heeft Joshua Lock het volgende geschreven:

> The connman scripts are useless without a Python interpreter so split
> them into a separate package and add Python to its RDEPENDS.

python, python-core or even python-core + modules?

regards,

Koen

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 480b59c..e86bd9f 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -30,6 +30,9 @@  do_install_append() {
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
 
+PACKAGES += "${PN}-scripts"
+RDEPENDS_${PN}-scripts += "python"
+
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -37,7 +40,6 @@  FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers \
-            ${libdir}/${PN}/test/* \
             ${datadir}/dbus-1/system-services/* \
             ${libdir}/connman/scripts/dhclient*"
 FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
@@ -45,6 +47,8 @@  FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
 
 FILES_${PN}-dev += "${libdir}/connman/plugins/*.la"
 
+FILES_${PN}-scripts += "${libdir}/${PN}/test/*"
+
 python populate_packages_prepend() {
 	prefix = (d.getVar("MLPREFIX", True) or "")
 	depmap = dict( wifi=prefix+"wpa-supplicant", bluetooth=prefix+"bluez4", ofono=prefix+"ofono" )