[OE-core] [oe-commits] Ross Burton : connman: ship the empty plugins directory in the connman package

[Martin Jansa]

On Mon, Jul 09, 2012 at 04:00:54PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 8a307af8253a5fdff51515fe01ef7b527fdad89f
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8a307af8253a5fdff51515fe01ef7b527fdad89f
> 
> Author: Ross Burton <ross.burton at intel.com>
> 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.

both patches from Ross in this batch are missing SOB lines.

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.

Cheers,

> 
> ---
> 
>  meta/recipes-connectivity/connman/connman.inc |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index 73e7818..12378e9 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 \
>              ${@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
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120709/1e32e4bb/attachment-0002.sig>