Added session script for ICO homescreen

Moved tlm to multi-user target

Change-Id: I9f7693cd76b460132d9dcb756ff9e22c5fab4048
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/data/tizen-ivi/etc/session.d/user-session-ico b/data/tizen-ivi/etc/session.d/user-session-ico
new file mode 100755 (executable)
index 0000000..fa16f32
--- /dev/null
+++ b/data/tizen-ivi/etc/session.d/user-session-ico
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
+export WAYLAND_CLIENT_DIR=/tmp
+export WESTON_CONFIG=/etc/xdg/weston/weston.ini
+weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so

diff --git a/data/tizen-ivi/etc/session.d/user-session-modello b/data/tizen-ivi/etc/session.d/user-session-modello
new file mode 100755 (executable)
index 0000000..0f9f15a
--- /dev/null
+++ b/data/tizen-ivi/etc/session.d/user-session-modello
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
+export WAYLAND_CLIENT_DIR=/tmp
+export WESTON_CONFIG=/etc/xdg/weston/weston-user.ini
+#weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so --width=720 --height=1080 &
+weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so &
+xwalk-launcher Modello005.Homescreen

diff --git a/data/tizen-ivi/etc/session.d/user-session.modello b/data/tizen-ivi/etc/session.d/user-session.modello
deleted file mode 100755 (executable)
index 0f9f15a..0000000
--- a/data/tizen-ivi/etc/session.d/user-session.modello
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
-export WAYLAND_CLIENT_DIR=/tmp
-export WESTON_CONFIG=/etc/xdg/weston/weston-user.ini
-#weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so --width=720 --height=1080 &
-weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so &
-xwalk-launcher Modello005.Homescreen

diff --git a/data/tlm.service b/data/tlm.service
index c078621b54a46856f5a684e1d466eeb6b6d03018..2193437f8e83808b749e41a47d0583da348f7288 100644 (file)
--- a/data/tlm.service
+++ b/data/tlm.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Tizen Login Manager
-After=systemd-user-sessions.service systemd-logind.service dbus.service
-Requires=multi-user.target
+After=systemd-user-sessions.service systemd-logind.service
+Requires=dbus.socket
 
 [Service]
 ExecStart=/usr/bin/tlm
@@ -11,4 +11,4 @@ ExecStart=/usr/bin/tlm
 #TTYPath=/dev/tty1
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target

diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index 38ef4e5697a23350a1da9b15dde18ec5a3c40e05..c02d1839e75224dd117f15b36e7d52c5e5a5d53c 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.spec
+++ b/dists/rpm/tizen/packaging/tlm.spec
@@ -286,7 +286,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
-%config(noreplace) %{_sysconfdir}/session.d/user-session.modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 
@@ -297,7 +298,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-multiseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-multiseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
-%config(noreplace) %{_sysconfdir}/session.d/user-session.modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 
@@ -308,7 +310,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-vtc1010.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-vtc1010
 %config(noreplace) %{_sysconfdir}/session.d/user-session
-%config(noreplace) %{_sysconfdir}/session.d/user-session.modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index 38ef4e5697a23350a1da9b15dde18ec5a3c40e05..c02d1839e75224dd117f15b36e7d52c5e5a5d53c 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -286,7 +286,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-singleseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
-%config(noreplace) %{_sysconfdir}/session.d/user-session.modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 
@@ -297,7 +298,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-multiseat.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-multiseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session
-%config(noreplace) %{_sysconfdir}/session.d/user-session.modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 
@@ -308,7 +310,8 @@ fi
 %config(noreplace) %{_sysconfdir}/tlm-vtc1010.conf
 %config(noreplace) %{_sysconfdir}/session.d/genivi-session-vtc1010
 %config(noreplace) %{_sysconfdir}/session.d/user-session
-%config(noreplace) %{_sysconfdir}/session.d/user-session.modello
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*