Some environment variable were set in the configuration files.
This wasn't a valuable solution. Allowing now system tuning to
put environment variables in files of /etc/afm/unit.env.d
is much more flexible.
This patch is introduced also to solve the folowing issue
Bug-AGL: SPEC-547
Change-Id: I41183735b707a9d5d30805504c2676afe12c3b8d
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
+++ /dev/null
-diff --git a/conf/afm-unit.conf b/conf/afm-unit.conf
-index 82113ef..2fbc9e2 100644
---- a/conf/afm-unit.conf
-+++ b/conf/afm-unit.conf
-@@ -127,6 +127,7 @@ SuccessExitStatus=0 SIGKILL
- WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}}
- ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}}
- Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
-+Environment=QT_WAYLAND_SHELL_INTEGRATION=ivi-shell
-
- %systemd-unit user
- {{#required-permission.urn:AGL:permission::public:hidden}}\
# tools used to install wgt at first boot
SRC_URI += "\
file://afm-install \
- file://add-qt-wayland-shell-integration.patch \
"
do_install_append_class-target() {
ln -sf ${systemd_user_unitdir}/afm-user-daemon.service ${D}${sysconfdir}/systemd/user/default.target.wants
fi
install -m 0755 ${WORKDIR}/afm-install ${D}${bindir}
+ echo "QT_WAYLAND_SHELL_INTEGRATION=ivi-shell" > ${D}${afm_confdir}/unit.env.d/qt-for-ivi-shell
}
-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_porter() {
+ echo "LD_PRELOAD=/usr/lib/libEGL.so" > ${D}${afm_confdir}/unit.env.d/preload-libEGL
}
pkg_postinst_${PN}() {
${SRC_URI_files} \
"
-SRCREV = "51a86fcd6e4f199009888b5a106bf472f1b7c742"
+SRCREV = "3f6dcaacd7abc85ebed40053a3ce73bc7753ddf9"
S = "${WORKDIR}/git"