[TIVI-2213] Added weston start-up files, and split config to subpackage.

Change-Id: I4fa9759d4343655ec56a717a90917629c8fc32de
Signed-off-by: Ossama Othman <ossama.othman@intel.com>

diff --git a/packaging/weston-ivi.spec b/packaging/weston-ivi.spec
index 1d0bd3b..480f956 100644 (file)
--- a/packaging/weston-ivi.spec
+++ b/packaging/weston-ivi.spec
@@ -7,11 +7,19 @@ Group:      Automotive/Configuration
 BuildArch:  noarch
 Source0:    %{name}-%{version}.tar.bz2
 Source1001: weston-ivi.manifest
-Requires: weekeyboard
+Provides:   weston-startup
 
 %description
-This package contains Tizen IVI-specific configuration and set-up for
-the Weston compositor.
+This package contains Tizen IVI-specific set-up for the Weston
+compositor, including systemd unit files, etc.
+
+%package config
+Summary:    Tizen IVI Weston configuration
+Group:      Automotive/Configuration
+Requires:   weekeyboard
+%description config
+This package contains Tizen IVI-specific configuration for the Weston
+compositor.
 
 %prep
 %setup -q
@@ -21,6 +29,13 @@ cp %{SOURCE1001} .
 
 %install
 
+install -d %{buildroot}%{_unitdir_user}/weston.target.wants
+install -m 644 weston.service %{buildroot}%{_unitdir_user}/weston.service
+ln -sf ../weston.service %{buildroot}/%{_unitdir_user}/weston.target.wants/
+
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
+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}
@@ -29,4 +44,10 @@ install -m 0644 weston.ini %{buildroot}%{weston_config_dir}
 %manifest %{name}.manifest
 %defattr(-,root,root)
 %license COPYING
+%{_unitdir_user}/weston.service
+%{_unitdir_user}/weston.target.wants/weston.service
+%config %{_sysconfdir}/profile.d/*
+
+%files config
+%manifest %{name}.manifest
 %config %{weston_config_dir}/weston.ini

diff --git a/weston.service b/weston.service
new file mode 100644 (file)
index 0000000..3f7e56a
--- /dev/null
+++ b/weston.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Weston
+Requires=dbus.socket
+
+[Service]
+ExecStart=/usr/bin/weston-launch -- -i0
+StandardInput=tty
+TTYPath=/dev/tty1
+
+[Install]
+WantedBy=weston.target

diff --git a/weston.sh b/weston.sh
new file mode 100644 (file)
index 0000000..e804c12
--- /dev/null
+++ b/weston.sh
@@ -0,0 +1,8 @@
+export ELM_ENGINE=wayland_egl
+export ECORE_EVAS_ENGINE=wayland_egl
+
+# Make EFL apps use the wayland-based input method.
+export ECORE_IMF_MODULE=wayland
+
+# also export dbus session address for dbus clients (details on bug TIVI-1686 [https://bugs.tizen.org/jira/browse/TIVI-1686])
+export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/dbus/user_bus_socket