summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-06 12:05:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:59:00 +0100
commitcc646d869f4273a8460af8f4eeb06d934769d073 (patch)
tree897308a7e00d4081a2ce2f4cb094439b58c092b5
parentbe696b35dfd90738b52bb00dda8733790be231ef (diff)
downloadpoky-cc646d869f4273a8460af8f4eeb06d934769d073.tar.gz
poky-cc646d869f4273a8460af8f4eeb06d934769d073.tar.bz2
poky-cc646d869f4273a8460af8f4eeb06d934769d073.zip
connman: ship the empty plugins directory in the connman package
Otherwise we get a QA warning that /usr/lib/connman/packages isn't shipped. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 73e7818dad..12378e9a20 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/*"