summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-03-05 20:42:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:58 +0000
commitbfd9b03a2052579701745b172dd4297530eeae9e (patch)
tree9a69d1a765d15811eb92a27e11b9b79a1e56eb34 /meta/recipes-connectivity
parent3936a26c3fe30f1e32ef877e01d33518a4d3a722 (diff)
downloadpoky-bfd9b03a2052579701745b172dd4297530eeae9e.tar.gz
avahi: fix installed but not shipped warning
The avahi recipe has a warning when build without systemd feature: WARNING: QA Issue: avahi: Files/directories were installed but not shipped /usr/share/dbus-1 The /usr/share/dbus-1 is empty without systemd feature, there would be /usr/share/dbus-1/system-services with systemd. Use rmdir to fix the problem, and remove the ${datadir}/dbus-1/interfaces from the FILES list which had been removed clearly by the do_install. [YOCTO #3939] (From OE-Core rev: 51cfcef15b59f7b97c871d9c0d6bf560c7b06c9b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 3a4547c3cf..1b7e26a1ca 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -90,7 +90,6 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
90 ${datadir}/avahi/introspection/*.introspect \ 90 ${datadir}/avahi/introspection/*.introspect \
91 ${datadir}/avahi/avahi-service.dtd \ 91 ${datadir}/avahi/avahi-service.dtd \
92 ${datadir}/avahi/service-types \ 92 ${datadir}/avahi/service-types \
93 ${datadir}/dbus-1/interfaces \
94 ${datadir}/dbus-1/system-services" 93 ${datadir}/dbus-1/system-services"
95FILES_libavahi-client = "${libdir}/libavahi-client.so.*" 94FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
96FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" 95FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
@@ -128,6 +127,7 @@ do_install() {
128 # if /var/run become non-empty in the future, need to install it via volatile 127 # if /var/run become non-empty in the future, need to install it via volatile
129 rm -rf ${D}/var/run 128 rm -rf ${D}/var/run
130 rm -rf ${D}${datadir}/dbus-1/interfaces 129 rm -rf ${D}${datadir}/dbus-1/interfaces
130 rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
131 rm -rf ${D}${libdir}/avahi 131 rm -rf ${D}${libdir}/avahi
132 132
133 install -d ${D}${sysconfdir}/udhcpc.d 133 install -d ${D}${sysconfdir}/udhcpc.d