mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

avahi-ui: support usrmerge

Browse Source 
(From OE-Core rev: 6e1fc83e7d7285211ae24e38b8fa7fbe7112d126)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changqing Li
2019-08-30 15:37:46 +08:00
committed by Richard Purdie
parent fd55f5e425
commit f46768df79
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
View File

@@ -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