Upgrade application framework

[AGL/meta-agl.git] / meta-app-framework / recipes-core / af-main / af-main_1.0.bb

diff --git a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb b/meta-app-framework/recipes-core/af-main/af-main_1.0.bb
index 834e293..86b5d34 100644 (file)
--- a/meta-app-framework/recipes-core/af-main/af-main_1.0.bb
+++ b/meta-app-framework/recipes-core/af-main/af-main_1.0.bb
@@ -12,7 +12,7 @@ BBCLASSEXTEND = "native"
 SECTION = "base"
 
 DEPENDS = "openssl libxml2 xmlsec1 systemd libzip json-c security-manager libcap-native af-binder"
-DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip"
+DEPENDS_class-native = "openssl libxml2 xmlsec1 libzip json-c"
 
 afm_name    = "afm"
 afm_confdir = "${sysconfdir}/${afm_name}"
@@ -64,6 +64,11 @@ SRC_URI += "\
        file://add-qt-wayland-shell-integration.patch \
 "
 
+# tools used to install wgt at first boot
+SRC_URI += "\
+       file://afm-install \
+"
+
 do_install_append() {
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/init-afm-dirs.sh ${D}${bindir}
@@ -71,21 +76,14 @@ do_install_append() {
         mkdir -p ${D}${sysconfdir}/systemd/user/default.target.wants
         mkdir -p ${D}${sysconfdir}/systemd/system/default.target.wants
         ln -sf ${systemd_user_unitdir}/afm-user-daemon.service ${D}${sysconfdir}/systemd/user/default.target.wants
-       install -p -D ${WORKDIR}/init-afm-dirs.service ${D}${systemd_unitdir}/system/init-afm-dirs.service
+       install -m 644 -p -D ${WORKDIR}/init-afm-dirs.service ${D}${systemd_unitdir}/system/init-afm-dirs.service
        ln -sf ${systemd_unitdir}/system/init-afm-dirs.service ${D}${sysconfdir}/systemd/system/default.target.wants
     fi
+    install -m 0755 ${WORKDIR}/afm-install ${D}${bindir}
 }
 
-do_install_append_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
-System User::Home       rwxat
-EOF
-    chmod 0644 ${D}/${sysconfdir}/smack/accesses.d/default-access-domains-no-user
-    install -d ${D}/${sysconfdir}/skel/app-data
-    chsmack -a 'User::Home' -t -D ${D}/${sysconfdir}/skel
-    chsmack -a 'User::App-Shared' -D ${D}/${sysconfdir}/skel/app-data
+do_install_append_qemux86-64() {
+    sed -i -e '/LD_PRELOAD=\/usr\/lib\/libEGL.so/d' ${D}${systemd_user_unitdir}/afm-user-daemon.service
 }
 
 pkg_postinst_${PN}() {