X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-app-framework%2Frecipes-core%2Fsecurity-manager%2Fsecurity-manager_%25.bbappend;h=bd1a43ea362ad48519542e1a5287f88bc3c54ff4;hb=3fb7b8cd823c8311c8b5a029d4afe178d4a524b8;hp=b4b5e01c4167529cbf34d733d1166fe0c0197d57;hpb=ed0ec649f38a3044aaf3d36222be0391872cf2f5;p=AGL%2Fmeta-agl.git

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 b4b5e01c4..bd1a43ea3 100644
--- a/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend
+++ b/meta-app-framework/recipes-core/security-manager/security-manager_%.bbappend
@@ -1,16 +1,24 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:"
 
+PACKAGE_WRITE_DEPS_append_smack = " smack-userspace-native"
+
 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"
+	     file://init-security-manager-db.sh \
+             file://0001-Fix-gcc6-build.patch \
+             file://0001-Fix-Cmake-conf-for-gcc6-build.patch \
+"
 
-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
-		install -p -D ${WORKDIR}/init-security-manager-db.service ${D}${systemd_unitdir}/system/init-security-manager-db.service
+		mkdir -p ${D}${systemd_unitdir}/system
+		mkdir -p ${D}${sysconfdir}/systemd/system/default.target.wants
+		install -m 644 -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
 }