From c9c00219d70e399d471fe61c658afa77cf48e84c Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 22 Dec 2014 11:24:29 +0200 Subject: [PATCH] weston-ivi-config-modello: update TLM configuration Once TLM login is enabled, weston-ivi configuration files are provided by tlm-config-ivi-*. However, to minimize the changes during the TLM enablement, just abuse existing weston-ivi-config-modello package to finish necessary config changes. FIXME: all weston-ivi* will go away soon. However, before that, the modello config changes need to be moved into, e.g., tlm-config-ivi-singleseat-modello. Change-Id: I223f6703cde46dd6f546102770520afeb4f2715f Signed-off-by: Mikko Ylinen --- packaging/weston-ivi.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packaging/weston-ivi.spec b/packaging/weston-ivi.spec index 0b2165b..69b5162 100644 --- a/packaging/weston-ivi.spec +++ b/packaging/weston-ivi.spec @@ -26,6 +26,7 @@ compositor. Summary: Tizen IVI Modello Weston configuration Group: Automotive/Configuration Requires: weekeyboard +Requires: tlm-config-ivi-singleseat Requires(post): sed Requires(postun): sed Conflicts: ico-uxf-weston-plugin, weston-ivi-config @@ -51,16 +52,12 @@ install -m 0644 weston.sh %{buildroot}%{_sysconfdir}/profile.d/ %define weston_config_dir %{_sysconfdir}/xdg/weston mkdir -p %{buildroot}%{weston_config_dir} install -m 0644 weston.ini %{buildroot}%{weston_config_dir} -install -m 0644 weston-modello.ini %{buildroot}%{weston_config_dir}/weston-modello.ini %post config-modello -ln -s %{weston_config_dir}/weston-modello.ini %{weston_config_dir}/weston.ini -sed -i 's/ --current-mode//' %{_unitdir_user}/weston.service - +sed -i 's/^\(SESSION_CMD\=.*user-session\)/\1-modello/' /etc/tlm-singleseat.conf %postun config-modello -rm %{weston_config_dir}/weston.ini -sed -i 's/\(^ExecStart.*\)/\1 --current-mode/' %{_unitdir_user}/weston.service +sed -i 's/-modello//' /etc/tlm-singleseat.conf %files %manifest %{name}.manifest @@ -76,4 +73,3 @@ sed -i 's/\(^ExecStart.*\)/\1 --current-mode/' %{_unitdir_user}/weston.service %files config-modello %manifest %{name}.manifest -%config %{weston_config_dir}/weston-modello.ini -- 2.7.4