Don't override SYSTEMD_SERVICE of original recipe.

Latest change for compatibility with OSTree introduced this bug, fix.

Change-Id: Ib9c7fe624fbbd722abe07ca08ff56f4334dbf13e
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>

diff --git a/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend b/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend
index b4b5e01..a4cd607 100644 (file)
--- a/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend
+++ b/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend
@@ -4,13 +4,16 @@ SRC_URI += " file://0001-Adapt-rules-to-AGL.patch \
             file://init-security-manager-db.service \
             file://init-security-manager-db.sh"
 
-SYSTEMD_SERVICE_${PN} = "init-security-manager-db.service"
-
-FILES_${PN}_append = "${bindir}/init-security-manager-db.sh"
+FILES_${PN}_append = "${bindir}/init-security-manager-db.sh \
+                     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/init-security-manager-db.service', '', d)} \
+"
 
 do_install_append () {
        install -p -D ${WORKDIR}/init-security-manager-db.sh ${D}${bindir}/init-security-manager-db.sh
        if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+               mkdir -p ${D}${systemd_unitdir}/system
+               mkdir -p ${D}${sysconfdir}/systemd/system/default.target.wants
                install -p -D ${WORKDIR}/init-security-manager-db.service ${D}${systemd_unitdir}/system/init-security-manager-db.service
+               ln -sf ${systemd_unitdir}/system/init-security-manager-db.service ${D}${sysconfdir}/systemd/system/default.target.wants
        fi
 }