avahi: unset FILES_avahi to avoid packaging files there

The main avahi recipe doesn't package anything into ${PN}.  If a library is
enabled but not put into a separate package it ends up in ${PN} and all the
packages are renamed using it's soname - ie libdns-sd-daemon.

Avoid this by clearing FILES_avahi so extra files are unpackaged instead of
creating a new package.  Also actually remove /var as the comments claim so the
avahi package is truly empty.

(From OE-Core rev: 324c6ac33ab44e4c1949b8001a53a8ffd2a979e2)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 3318f40384..b97c4c5016 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -73,6 +73,9 @@ do_configure_prepend() {
 
 PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils"
 
+# As avahi doesn't put any files into PN, clear the files list to avoid problems
+# if extra libraries appear.
+FILES_avahi = ""
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
                        ${sysconfdir}/dhcp/*/avahi-autoipd \
@@ -122,7 +125,8 @@ do_install() {
         # don't install /var/run when populating rootfs. Do it through volatile
         # /var/run of current version is empty, so just remove it.
         # if /var/run become non-empty in the future, need to install it via volatile
-        rm -rf ${D}/var/run
+        rm -rf ${D}${localstatedir}/run
+        rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
         rm -rf ${D}${datadir}/dbus-1/interfaces
         rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
         rm -rf ${D}${libdir}/avahi