diff options
author | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-03-27 12:18:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@automotivelinux.org> | 2017-03-27 12:18:56 +0000 |
commit | a72d5234e827756647c0fb78e70e2d8e4d6f2ab0 (patch) | |
tree | cf20b6cf949db82794637c97218f17ed26ff5a97 /meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch | |
parent | 8bdc96fe0f1b7aa680ca10bed211c2164a803d8b (diff) | |
parent | e08fc103ed64dc90a33f2d237c64894d837188cc (diff) |
Merge "Move to AGL framework on top of systemd"
Diffstat (limited to 'meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch')
-rw-r--r-- | meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch b/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch index 8e21678..c92415b 100644 --- a/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch +++ b/meta-app-framework/recipes-core/af-main/af-main/add-qt-wayland-shell-integration.patch @@ -1,11 +1,12 @@ -diff --git a/conf/afm-user-daemon.service b/conf/afm-user-daemon.service -index 6b5c1d8..e0f6799 100644 ---- a/conf/afm-user-daemon.service -+++ b/conf/afm-user-daemon.service -@@ -7,6 +7,7 @@ BusName=org.AGL.afm.user - ExecStart=/usr/bin/afm-user-daemon --user-dbus=unix:path=%t/bus - Environment=AFM_APP_INSTALL_DIR=%%r - Environment=LD_PRELOAD=/usr/lib/libEGL.so +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 - Restart=on-failure - RestartSec=5 + + %systemd-unit user + {{#required-permission.urn:AGL:permission::public:hidden}}\ |