summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-10-09 08:37:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-10 10:39:13 +0100
commit1e6ec39d4996d2812b01c4452c579e476e70e85d (patch)
treed0747e18e7c8c1fecfc6efa797048e660a47357b
parentda70a62d456f7efac379381c2c431cc4ded877e9 (diff)
downloadopenembedded-core-contrib-1e6ec39d4996d2812b01c4452c579e476e70e85d.tar.gz
openembedded-core-contrib-1e6ec39d4996d2812b01c4452c579e476e70e85d.tar.bz2
openembedded-core-contrib-1e6ec39d4996d2812b01c4452c579e476e70e85d.zip
avahi-ui: fix for building systemd with multilib
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 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
index 070530ec3f..eea4d70fab 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
@@ -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*