diff options
| author | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-04-11 16:23:44 +0200 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@open.eurogiciel.org> | 2014-04-11 16:23:44 +0200 |
| commit | 8e2a10cf5f948676685ffc7377ea89d5f928330a (patch) | |
| tree | 200104fc7304ac0d390b36c1eb29a6b3feae0cb8 | |
| parent | 26a6b693f629ef1d1db6d82dda27377f73c06f05 (diff) | |
| download | weston-common-8e2a10cf5f948676685ffc7377ea89d5f928330a.tar.gz weston-common-8e2a10cf5f948676685ffc7377ea89d5f928330a.tar.bz2 weston-common-8e2a10cf5f948676685ffc7377ea89d5f928330a.zip | |
fix tz-launcher environment for EFL
Change-Id: If325358a627c7f9cb1108d92ff0ac7034d79ef16
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
| -rw-r--r-- | display-manager.service | 2 | ||||
| -rw-r--r-- | packaging/weston-generic.spec | 5 | ||||
| -rw-r--r-- | weston-user.service | 1 | ||||
| -rw-r--r-- | weston-user.sysconfig | 5 |
4 files changed, 11 insertions, 2 deletions
diff --git a/display-manager.service b/display-manager.service index dc6e1ab..8b50b3e 100644 --- a/display-manager.service +++ b/display-manager.service @@ -1,5 +1,7 @@ [Unit] Description=Display manager setup service +Requires=display-manager-run.service +After=display-manager-run.service [Service] ExecStart=/usr/bin/chmod g+w /run/display/wayland-0 diff --git a/packaging/weston-generic.spec b/packaging/weston-generic.spec index bebd617..42ae626 100644 --- a/packaging/weston-generic.spec +++ b/packaging/weston-generic.spec @@ -74,9 +74,10 @@ install -m 644 display-manager-run.service %{buildroot}%{_unitdir}/display-manag install -m 644 display-manager.service %{buildroot}%{_unitdir}/display-manager.service install -m 644 display-manager.path %{buildroot}%{_unitdir}/display-manager.path -# install Environment file for weston service +# install Environment file for weston service and weston-user.service mkdir -p %{buildroot}%{_sysconfdir}/sysconfig install -m 0644 weston.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/weston +install -m 0644 weston-user.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/weston-user # install tmpfiles.d(5) conf mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d @@ -134,7 +135,7 @@ ln -sf ../weston-user.service %{_unitdir_user}/default.target.wants/ %{_unitdir}/display-manager-run.service %{_unitdir}/display-manager.service %{_unitdir}/display-manager.path -%config %{_sysconfdir}/sysconfig/weston +%config %{_sysconfdir}/sysconfig/* %{_prefix}/lib/tmpfiles.d/weston.conf %{_unitdir_user}/weston-user.service %config %{_sysconfdir}/profile.d/* diff --git a/weston-user.service b/weston-user.service index a49e7d9..f15d574 100644 --- a/weston-user.service +++ b/weston-user.service @@ -4,6 +4,7 @@ Description=Shared weston session [Service] ExecStartPre=/usr/bin/ln -sf /run/display/wayland-0 /run/user/%U/ ExecStart=/usr/bin/tz-launcher -c /usr/share/applications/tizen/launcher.conf %h/.applications/desktop +EnvironmentFile=/etc/sysconfig/weston-user [Install] WantedBy=default.target diff --git a/weston-user.sysconfig b/weston-user.sysconfig new file mode 100644 index 0000000..0acd751 --- /dev/null +++ b/weston-user.sysconfig @@ -0,0 +1,5 @@ +ELM_ENGINE=wayland_egl +ECORE_EVAS_ENGINE=wayland_egl +ELM_THEME=tizen-HD-light +ECORE_IMF_MODULE=wayland + |