From 6e1fc83e7d7285211ae24e38b8fa7fbe7112d126 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 30 Aug 2019 15:37:46 +0800 Subject: avahi-ui: support usrmerge Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi-ui_0.7.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity') 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 \ do_install_append () { rm ${D}${sysconfdir} -rf - rm ${D}${base_libdir} -rf + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then + if [ "${nonarch_base_libdir}" != "${base_libdir}" ];then + rm ${D}${nonarch_base_libdir} -rf + fi + else + rm ${D}${base_libdir} -rf + fi 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 -- cgit 1.2.3-korg