Fix QA warnings from ConnMan

PATCH Applied Ross Burton 2 participants 4 messages Jul 6, 2012 – Jul 9, 2012

Share & tools

Ross Burton

author

2012-07-06 11:50 UTC #0 lore raw

cover Fix QA warnings from ConnMan

ConnMan warns that /usr/lib/connman/plugins isn't shipped, so ship the empty directory in the main package. Whilst there, remove some entirely pointless entires in FILES.

The following changes since commit 5051e9837fa698e03d0a7a8a918ee7aa98409ce1:

bitbake: usermanual: Fix missing markup (2012-07-06 09:41:56 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/connman

for you to fetch changes up to e7d865a01ec2b7f0aaf8bfd38d1604e9c1764207:

connman: ship the empty plugins directory in the connman package (2012-07-06 12:30:41 +0100)

----------------------------------------------------------------
Ross Burton (2):
connman: remove some obviously wrong (circa early-GNOME 2?) directories from FILES
connman: ship the empty plugins directory in the connman package

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

Ross Burton (2):
connman: remove some obviously wrong (circa early-GNOME 2?)
directories from FILES
connman: ship the empty plugins directory in the connman package

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

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-06 11:50 UTC #1 lore raw

PATCH 1/2 connman: remove some obviously wrong (circa early-GNOME 2?) directories from FILES

---
 meta/recipes-connectivity/connman/connman.inc |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

meta/recipes-connectivity/connman/connman.inc +1 -4

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

@@ -118,9 +118,6 @@ RDEPENDS_${PN}-tests = "python-dbus"
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
-            ${datadir}/pixmaps ${datadir}/applications \
-            ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
-            ${libdir}/bonobo/servers \
             ${datadir}/dbus-1/system-services/*"
 
 FILES_${PN}-dbg += "${libdir}/connman/*/.debug"

Signature · 1 line

1.7.10

Ross Burton

author

2012-07-06 11:50 UTC #2 lore raw

PATCH 2/2 connman: ship the empty plugins directory in the connman package

In reply to Ross Burton

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

---
 meta/recipes-connectivity/connman/connman.inc |    5 +++--
 1 file 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/*"

Signature · 1 line

1.7.10

Saul Wold

Applied

2012-07-09 17:06 UTC #3 lore raw

In reply to Ross Burton

Quoted 24 lines · Ross Burton

ConnMan warns that /usr/lib/connman/plugins isn't shipped, so ship the empty directory in the main package. Whilst there, remove some entirely pointless entires in FILES.
The following changes since commit 5051e9837fa698e03d0a7a8a918ee7aa98409ce1:
bitbake: usermanual: Fix missing markup (2012-07-06 09:41:56 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/connman
for you to fetch changes up to e7d865a01ec2b7f0aaf8bfd38d1604e9c1764207:
connman: ship the empty plugins directory in the connman package (2012-07-06 12:30:41 +0100)
----------------------------------------------------------------
Ross Burton (2):
connman: remove some obviously wrong (circa early-GNOME 2?) directories from FILES
connman: ship the empty plugins directory in the connman package
  meta/recipes-connectivity/connman/connman.inc |    8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)

Quoted 8 lines

Ross Burton (2):
connman: remove some obviously wrong (circa early-GNOME 2?)
directories from FILES
connman: ship the empty plugins directory in the connman package
  meta/recipes-connectivity/connman/connman.inc |    8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)

Merged into OE-Core

Thanks
Sau!