diff mbox series

[kirkstone,14/39] boinc-client: Do not overwrite same file when using usrmerge

Message ID a33240dcaa97610034f6d0f9661bfcc44f29cd5e.1651346200.git.akuster808@gmail.com
State Accepted, archived
Headers show
Series [kirkstone,01/39] crash: Upgrade to 8.0.0 | expand

Commit Message

akuster808 April 30, 2022, 7:17 p.m. UTC 
From: Khem Raj <raj.khem@gmail.com>

in case usrmerge is enabled, unit file is already in expected location

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit b8e97f5b2a11c0d4be9f61821aead402780a4be7)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

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 () {
 }
 
 do_install:append() {
-	if [ -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service ]; then
+	if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)} -a \
+            -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service; then
 		install -d ${D}${systemd_system_unitdir}
 		mv \
 		${D}${nonarch_libdir}/systemd/system/boinc-client.service \