summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
index 5e991d3099..abcb304d30 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb
@@ -76,7 +76,8 @@ do_compile:prepend () {
76} 76}
77 77
78do_install:append() { 78do_install:append() {
79 if [ -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service ]; then 79 if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)} -a \
80 -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service; then
80 install -d ${D}${systemd_system_unitdir} 81 install -d ${D}${systemd_system_unitdir}
81 mv \ 82 mv \
82 ${D}${nonarch_libdir}/systemd/system/boinc-client.service \ 83 ${D}${nonarch_libdir}/systemd/system/boinc-client.service \