X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-app-framework%2Frecipes-core%2Faf-main%2Faf-main_1.0.bb;h=e229cd22f34f8efd2b98fc2d634b34ebb5dd7e9c;hb=953167ff715a932338ce55c63b6115cb7352157f;hp=834e293fa3cb8e63e5052023b4c362a945c4f4b4;hpb=ed0ec649f38a3044aaf3d36222be0391872cf2f5;p=AGL%2Fmeta-agl.git

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 834e293fa..e229cd22f 100644
--- 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,9 +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_qemux86-64() {
+    sed -i -e '/LD_PRELOAD=\/usr\/lib\/libEGL.so/d' ${D}${systemd_user_unitdir}/afm-user-daemon.service
 }
 
 do_install_append_smack () {