summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-02-27 18:57:56 +0100
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-02-27 18:59:50 +0100
commit2a18d038b0a0f60f59a95f638fe95281fd87e661 (patch)
treecd35465d952f2fc00657ef7472f8837b967a55cb
parent22746c39fb3372210fd53e8bbeb0264ddc933b6a (diff)
downloadweston-common-2a18d038b0a0f60f59a95f638fe95281fd87e661.tar.gz
weston-common-2a18d038b0a0f60f59a95f638fe95281fd87e661.tar.bz2
weston-common-2a18d038b0a0f60f59a95f638fe95281fd87e661.zip
Added weston start-up files, and split config to subpackage
Change-Id: Id73c75e5011b2b8ac9ae5f585783bc3aa56b43d5 Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
-rw-r--r--packaging/weston-generic.changes5
-rw-r--r--packaging/weston-generic.spec23
-rw-r--r--weston.service11
-rw-r--r--weston.sh11
4 files changed, 48 insertions, 2 deletions
diff --git a/packaging/weston-generic.changes b/packaging/weston-generic.changes
index aced762..3b48b2d 100644
--- a/packaging/weston-generic.changes
+++ b/packaging/weston-generic.changes
@@ -1,3 +1,6 @@
-* Thu Feb 27 2014 Stephane Desneux <stephane.desneux@open.eurogiciel.org> d8b517b
+* Thu Feb 27 2014 Stephane Desneux <stephane.desneux@open.eurogiciel.org> eba0c0d
+- Added weston start-up files, and split config to subpackage
+
+* Thu Feb 27 2014 Stephane Desneux <stephane.desneux@open.eurogiciel.org> 22746c3
- initial packaging
diff --git a/packaging/weston-generic.spec b/packaging/weston-generic.spec
index 5e11cde..6fd9865 100644
--- a/packaging/weston-generic.spec
+++ b/packaging/weston-generic.spec
@@ -7,10 +7,18 @@ Group: Base/Configuration
BuildArch: noarch
Source0: %{name}-%{version}.tar.bz2
Source1001: weston-generic.manifest
+Provides: weston-startup
%description
This package contains Tizen Generic configuration and set-up for
-the Weston compositor.
+the Weston compositor, including systemd unit files.
+
+%package config
+Summary: Tizen Generic Weston configuration
+Group: Base/Configuration
+%description config
+This package contains Tizen Generic configuration for the Weston
+compositor.
%prep
%setup -q
@@ -20,6 +28,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}
@@ -28,4 +43,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
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
index 0000000..6ef0db1
--- /dev/null
+++ b/weston.sh
@@ -0,0 +1,11 @@
+export ELM_ENGINE=wayland_egl
+export ECORE_EVAS_ENGINE=wayland_egl
+export ELM_THEME=tizen-HD-light
+
+# 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
+
+