avahi-ui: fix for building systemd with multilib

The following changes since commit 16cedc3bce6fc37543e9ef053cd7c589e523ca1c:

package_ipk.bbclass: Fix SRC_URI whitespace handling (2014-10-06 16:03:03 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/avahi
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/avahi

Robert Yang (1):
avahi-ui: fix for building systemd with multilib

 meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

1.7.9.5

Fixed:
MACHINE = "qemux86-64" VIRTUAL-RUNTIME_init_manager = " systemd " DISTRO_FEATURES_append = " systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED += " sysvinit "

require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"

$ bitbake avahi avahi-ui
ERROR: QA Issue: avahi-ui: Files/directories were installed but not shipped
  /lib
  /lib/systemd
  /lib/systemd/system
  /lib/systemd/system/avahi-daemon.socket
  /lib/systemd/system/avahi-dnsconfd.service
  /lib/systemd/system/avahi-daemon.service [installed-vs-shipped]
ERROR: The recipe avahi-ui is trying to install files into a sharedarea when those files already exist. Those files and their manifestlocation are:
   /path/to/sysroots/qemux86-64/lib/systemd/system/avahi-daemon.socket
 Matched in manifest-qemux86-64-avahi.populate_sysroot
 /path/to/sysroots/qemux86-64/lib/systemd/system/avahi-dnsconfd.service
 Matched in manifest-qemux86-64-avahi.populate_sysroot
 /path/to/sysroots/qemux86-64/lib/systemd/system/avahi-daemon.service
 Matched in manifest-qemux86-64-avahi.populate_sysroot
Please verify which recipe should provide theabove files.

And remove the duplicated line:
rm ${D}${base_libdir} -rf

---
 meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

index 070530e..eea4d70 100644
@@ -45,7 +45,11 @@ RDEPENDS_python-avahi = "python-core python-dbus"
 do_install_append () {
 	rm ${D}${sysconfdir} -rf
 	rm ${D}${base_libdir} -rf
-	rm ${D}${base_libdir} -rf
+	rm ${D}${systemd_unitdir} -rf
+	# The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
+	# but not ${base_libdir} here. And the /lib may not exist
+	# whithout systemd.
+	[ ! -d ${D}/lib ] || rmdir ${D}/lib --ignore-fail-on-non-empty
 	rm ${D}${bindir}/avahi-b*
 	rm ${D}${bindir}/avahi-p*
 	rm ${D}${bindir}/avahi-r*

1.7.9.5