summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-06 11:05:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 15:59:00 (GMT)
commitcc646d869f4273a8460af8f4eeb06d934769d073 (patch)
tree897308a7e00d4081a2ce2f4cb094439b58c092b5
parentbe696b35dfd90738b52bb00dda8733790be231ef (diff)
downloadpoky-cc646d869f4273a8460af8f4eeb06d934769d073.tar.gz
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 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 \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r10" 23INC_PR = "r11"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_powerpc = ""
@@ -99,7 +99,7 @@ python populate_packages_prepend() {
99 hook = lambda file,pkg,b,c,d:packages.append((file,pkg)) 99 hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
100 plugin_dir = d.expand('${libdir}/connman/plugins/') 100 plugin_dir = d.expand('${libdir}/connman/plugins/')
101 plugin_name = d.expand('${PN}-plugin-%s') 101 plugin_name = d.expand('${PN}-plugin-%s')
102 do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook ) 102 do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook, prepend=True )
103 for (file, package) in packages: 103 for (file, package) in packages:
104 plugintype = package.split( '-' )[-1] 104 plugintype = package.split( '-' )[-1]
105 if plugintype in depmap: 105 if plugintype in depmap:
@@ -116,6 +116,7 @@ FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*"
116RDEPENDS_${PN}-tests = "python-dbus" 116RDEPENDS_${PN}-tests = "python-dbus"
117 117
118FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ 118FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
119 ${libdir}/connman/plugins \
119 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 120 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
120 ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ 121 ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \
121 ${datadir}/dbus-1/system-services/*" 122 ${datadir}/dbus-1/system-services/*"