Ross Burton : connman: ship the empty plugins directory in the connman package

Module: openembedded-core.git
Branch: master
Commit: 8a307af8253a5fdff51515fe01ef7b527fdad89f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8a307af8253a5fdff51515fe01ef7b527fdad89f

Author: Ross Burton <[email protected]>
Date:   Fri Jul  6 12:05:42 2012 +0100

connman: ship the empty plugins directory in the connman package

Otherwise we get a QA warning that /usr/lib/connman/packages isn't shipped.

---

 meta/recipes-connectivity/connman/connman.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

meta/recipes-connectivity/connman/connman.inc +3 -2

index 73e7818..12378e9 100644
@@ -20,7 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r10"
+INC_PR = "r11"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""

@@ -99,7 +99,7 @@ python populate_packages_prepend() {
 	hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
 	plugin_dir = d.expand('${libdir}/connman/plugins/')
 	plugin_name = d.expand('${PN}-plugin-%s')
-	do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook )
+	do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook, prepend=True )
 	for (file, package) in packages:
 		plugintype = package.split( '-' )[-1]
 		if plugintype in depmap:

@@ -116,6 +116,7 @@ FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*"
 RDEPENDS_${PN}-tests = "python-dbus"
 
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
+            ${libdir}/connman/plugins \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
             ${datadir}/dbus-1/system-services/*"

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Ross: please make sure you add them in future patches
sgw: maybe you're using different flow then RP for merging patches, but your SOB should be there too IMHO.

Quoted 3 lines · Martin Jansa

Ross: please make sure you add them in future patches
sgw: maybe you're using different flow then RP for merging patches, but your SOB should be there too IMHO.

I *always* forget, sorry. Is there a way to make git do it automatically?...

Quoted 6 lines · Ross

Quoted 3 lines · Martin Jansa

Ross: please make sure you add them in future patches
sgw: maybe you're using different flow then RP for merging patches, but your SOB should be there too IMHO.

I *always* forget, sorry. Is there a way to make git do it automatically?...

Not sure if there is smarter way. I'm using aliases for commit and cherry-pick to always add '-s'.