summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-08-30 15:37:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-01 22:33:07 +0100
commitf46768df79e3578fb7a0d50cc0592be58327f34e (patch)
tree78715a6bd68096bd1022b3cf8fa00502dddef6af /meta/recipes-connectivity
parentfd55f5e425a2b0e73e32cfebb961c8afb967744a (diff)
downloadpoky-f46768df79e3578fb7a0d50cc0592be58327f34e.tar.gz
avahi-ui: support usrmerge
(From OE-Core rev: 6e1fc83e7d7285211ae24e38b8fa7fbe7112d126) Signed-off-by: Changqing Li <changqing.li@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-ui_0.7.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
index a77653bf55..1c6e46aaba 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
@@ -20,7 +20,13 @@ FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
20 20
21do_install_append () { 21do_install_append () {
22 rm ${D}${sysconfdir} -rf 22 rm ${D}${sysconfdir} -rf
23 rm ${D}${base_libdir} -rf 23 if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
24 if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then
25 rm ${D}${nonarch_base_libdir} -rf
26 fi
27 else
28 rm ${D}${base_libdir} -rf
29 fi
24 rm ${D}${systemd_unitdir} -rf 30 rm ${D}${systemd_unitdir} -rf
25 # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib, 31 # The ${systemd_unitdir} is /lib/systemd, so we need rmdir /lib,
26 # but not ${base_libdir} here. And the /lib may not exist 32 # but not ${base_libdir} here. And the /lib may not exist