X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-app-framework%2Frecipes-core%2Fbase-files%2Fbase-files_%25.bbappend;h=536ce8075ae3b6b681ad869bf036896e9584a526;hb=refs%2Fchanges%2F83%2F19083%2F3;hp=0e93b4d6529627926ae471f668d569420389c1f2;hpb=3564e1dd729f8044d3d7bbb8f025e893da4d5716;p=AGL%2Fmeta-agl.git

diff --git a/meta-app-framework/recipes-core/base-files/base-files_%.bbappend b/meta-app-framework/recipes-core/base-files/base-files_%.bbappend
index 0e93b4d65..536ce8075 100644
--- a/meta-app-framework/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-app-framework/recipes-core/base-files/base-files_%.bbappend
@@ -1,5 +1,5 @@
-DEPENDS_append_smack = " smack-userspace-native"
-RDEPENDS_${PN}_append_smack = " smack-userspace"
+RDEPENDS_${PN}_append_with-lsm-smack = " smack"
+PACKAGE_WRITE_DEPS_append_with-lsm-smack = " smack-native"
 
 do_install_append() {
     install -d ${D}/${sysconfdir}/skel/app-data
@@ -10,10 +10,10 @@ do_install_append() {
     else
         install -m 0755 -d ${D}/var/local
     fi
-    ln -s ../../var/local ${D}/usr/local
+    ln -s ../var/local ${D}/usr/local
 }
 
-do_install_append_smack () {
+do_install_append_with-lsm-smack () {
     install -d ${D}/${sysconfdir}/smack/accesses.d
     cat > ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user <<EOF
 System User::App-Shared rwxat
@@ -22,8 +22,9 @@ EOF
     chmod 0644 ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user
 }
 
-pkg_postinst_${PN}_append_smack() {
+pkg_postinst_${PN}_append_with-lsm-smack() {
     chsmack -r -a 'User::Home' -t -D $D/${sysconfdir}/skel
     chsmack -a 'User::App-Shared' -D $D/${sysconfdir}/skel/app-data
+    cp -rTf --preserve=all $D/${sysconfdir}/skel $D/${ROOT_HOME}
 }