Added config packages for modello and ico homescreen

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

diff --git a/configure b/configure
index e65d402..c441b65 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tlm 1.0.2.
+# Generated by GNU Autoconf 2.69 for tlm 1.0.3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tlm'
 PACKAGE_TARNAME='tlm'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='tlm 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='tlm 1.0.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tlm 1.0.2 to adapt to many kinds of systems.
+\`configure' configures tlm 1.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tlm 1.0.2:";;
+     short | recursive ) echo "Configuration of tlm 1.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1599,7 +1599,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tlm configure 1.0.2
+tlm configure 1.0.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1964,7 +1964,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tlm $as_me 1.0.2, which was
+It was created by tlm $as_me 1.0.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2832,7 +2832,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tlm'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14250,7 +14250,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tlm $as_me 1.0.2, which was
+This file was extended by tlm $as_me 1.0.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14316,7 +14316,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tlm config.status 1.0.2
+tlm config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index b776d01..0192719 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([tlm], [1.0.2], [])
+AC_INIT([tlm], [1.0.3], [])
 AC_CONFIG_SRCDIR([src/daemon/tlm-main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/data/tizen-ivi/etc/profile.d/weston-env-ivi.sh b/data/tizen-ivi/etc/profile.d/weston-env-ivi.sh
new file mode 100644 (file)
index 0000000..a4c1a40
--- /dev/null
+++ b/data/tizen-ivi/etc/profile.d/weston-env-ivi.sh
@@ -0,0 +1,5 @@
+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

diff --git a/data/tizen-ivi/etc/session.d/user-session-modello b/data/tizen-ivi/etc/session.d/user-session-modello
index 0f9f15a..0724717 100755 (executable)
--- a/data/tizen-ivi/etc/session.d/user-session-modello
+++ b/data/tizen-ivi/etc/session.d/user-session-modello
@@ -2,7 +2,7 @@
 #
 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
+export WESTON_CONFIG=/etc/xdg/weston/weston-user-modello.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/tlm-singleseat-ico.conf b/data/tizen-ivi/etc/tlm-singleseat-ico.conf
new file mode 100644 (file)
index 0000000..8946152
--- /dev/null
+++ b/data/tizen-ivi/etc/tlm-singleseat-ico.conf
@@ -0,0 +1,83 @@
+#
+# Configuration file for single seat TLM.
+#
+
+#
+# This group contains top-level settings.
+#
+[General]
+#
+# Name of the account plugin to use to manage(add/remove) guest user accounts
+ACCOUNTS_PLUGIN=gumd
+#
+# Auto-login default user
+# Default: off
+AUTO_LOGIN=1
+#
+# Prepare default/guest users before auto-login
+# Default: off
+# PREPARE_DEFAULT=1
+#
+# PAM service file to use
+PAM_SERVICE=tlm-login
+#
+# PAM service file for default user
+DEFAULT_PAM_SERVICE=tlm-default-login
+#
+# Default (guest) username or template to use
+#  %S - seat number
+#  %I - seat id string
+# Default: "guest"
+DEFAULT_USER=guest_%S
+#
+# Session command : The command run after successfull login
+# Default: $SHELL
+# In case shell is not defined in /etc/passwd fallback is "systemd --user"
+#SESSION_CMD=systemd --user
+#
+# Session termination timeout in seconds
+# Default: 10
+#TERMINATE_TIMEOUT=10
+#
+# Setup terminal for session
+# Default: off
+#SETUP_TERMINAL=1
+#
+# Use X11 style sessions
+# Default: off
+#X11_SESSION=1
+#
+# Do not launch anything, let systemd handle it through PAM
+# Default: off
+#PAUSE_SESSION=1
+#
+# Specify session type
+# Default: unspecified
+#SESSION_TYPE=wayland
+#
+NSEATS=2
+#
+#
+# Seat specific settings where the group name is seat id
+[seat0]
+DEFAULT_USER=genivi
+SETUP_TERMINAL=1
+VTNR=7
+SESSION_CMD=/etc/session.d/genivi-session-singleseat
+DEFAULT_PAM_SERVICE=tlm-system-login
+SETUP_RUNTIME_DIR=1
+#
+[seat1]
+DEFAULT_USER=app
+SETUP_TERMINAL=1
+VTNR=1
+SESSION_CMD=/etc/session.d/user-session-ico
+NWATCH=1
+WATCH0=/tmp/wayland-0.lock
+#
+#
+# plugin specific settings.
+#
+#[pluginname]
+#
+

diff --git a/data/tizen-ivi/etc/tlm-singleseat-modello.conf b/data/tizen-ivi/etc/tlm-singleseat-modello.conf
new file mode 100644 (file)
index 0000000..5296382
--- /dev/null
+++ b/data/tizen-ivi/etc/tlm-singleseat-modello.conf
@@ -0,0 +1,83 @@
+#
+# Configuration file for single seat TLM.
+#
+
+#
+# This group contains top-level settings.
+#
+[General]
+#
+# Name of the account plugin to use to manage(add/remove) guest user accounts
+ACCOUNTS_PLUGIN=gumd
+#
+# Auto-login default user
+# Default: off
+AUTO_LOGIN=1
+#
+# Prepare default/guest users before auto-login
+# Default: off
+# PREPARE_DEFAULT=1
+#
+# PAM service file to use
+PAM_SERVICE=tlm-login
+#
+# PAM service file for default user
+DEFAULT_PAM_SERVICE=tlm-default-login
+#
+# Default (guest) username or template to use
+#  %S - seat number
+#  %I - seat id string
+# Default: "guest"
+DEFAULT_USER=guest_%S
+#
+# Session command : The command run after successfull login
+# Default: $SHELL
+# In case shell is not defined in /etc/passwd fallback is "systemd --user"
+#SESSION_CMD=systemd --user
+#
+# Session termination timeout in seconds
+# Default: 10
+#TERMINATE_TIMEOUT=10
+#
+# Setup terminal for session
+# Default: off
+#SETUP_TERMINAL=1
+#
+# Use X11 style sessions
+# Default: off
+#X11_SESSION=1
+#
+# Do not launch anything, let systemd handle it through PAM
+# Default: off
+#PAUSE_SESSION=1
+#
+# Specify session type
+# Default: unspecified
+#SESSION_TYPE=wayland
+#
+NSEATS=2
+#
+#
+# Seat specific settings where the group name is seat id
+[seat0]
+DEFAULT_USER=genivi
+SETUP_TERMINAL=1
+VTNR=7
+SESSION_CMD=/etc/session.d/genivi-session-singleseat
+DEFAULT_PAM_SERVICE=tlm-system-login
+SETUP_RUNTIME_DIR=1
+#
+[seat1]
+DEFAULT_USER=app
+SETUP_TERMINAL=1
+VTNR=1
+SESSION_CMD=/etc/session.d/user-session-modello
+NWATCH=1
+WATCH0=/tmp/wayland-0.lock
+#
+#
+# plugin specific settings.
+#
+#[pluginname]
+#
+

diff --git a/data/tizen-ivi/weston-genivi.ini b/data/tizen-ivi/weston-genivi.ini
index e0d4d58..7f76d65 100644 (file)
--- a/data/tizen-ivi/weston-genivi.ini
+++ b/data/tizen-ivi/weston-genivi.ini
@@ -14,6 +14,9 @@ startup-animation=fade
 [input-method]
 path=/usr/libexec/weston-keyboard
 
+[keyboard]
+keymap_layout=wkb
+
 #[output]
 #name=LVDS1
 #mode=1680x1050

diff --git a/data/tizen-ivi/weston-user-modello.ini b/data/tizen-ivi/weston-user-modello.ini
new file mode 100644 (file)
index 0000000..8a1902e
--- /dev/null
+++ b/data/tizen-ivi/weston-user-modello.ini
@@ -0,0 +1,43 @@
+[core]
+#modules=cms-colord.so
+#shell=desktop-shell.so
+
+[shell]
+background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+background-color=0xff248bd1
+background-type=tile
+panel-color=0xff2a3c4a
+locking=true
+animation=zoom
+startup-animation=fade
+panel-location=none
+
+[input-method]
+path=/bin/weekeyboard
+
+#[output]
+#name=LVDS1
+#mode=1680x1050
+#transform=90
+#icc_profile=/usr/share/color/icc/colord/Bluish.icc
+
+#[output]
+#name=VGA1
+#mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
+#transform=flipped
+
+#[output]
+#name=X1
+#mode=1024x768
+#transform=flipped-270
+
+#[touchpad]
+#constant_accel_factor = 50
+#min_accel_factor = 0.16
+#max_accel_factor = 1.0
+
+[output]
+name=DP1
+mode=1280x720@60
+transform=90
+

diff --git a/dists/debian/changelog b/dists/debian/changelog
index c8fcac5..5e99d54 100644 (file)
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,9 @@
+tlm (1.0.3-0) unstable; urgency=low
+
+  * Added config package for modello
+
+ -- Imran Zaman <imran.zaman@intel.com>  Tue, 23 Dec 2014 17:56:53 +0200
+
 tlm (1.0.2-0) unstable; urgency=low
 
   * set PAM_TTY to the to-be-session-TTY

diff --git a/dists/rpm/tizen/packaging/tlm.changes b/dists/rpm/tizen/packaging/tlm.changes
index dc460bd..165a00c 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.changes
+++ b/dists/rpm/tizen/packaging/tlm.changes
@@ -1,3 +1,6 @@
+* Tue Dec 23 2014 Imran Zaman <imran.zaman@intel.com>
+- Added config package for modello
+
 * Mon Dec 15 2014 Imran Zaman <imran.zaman@intel.com>
 - set PAM_TTY to the to-be-session-TTY
 - cleaned up spec file for yocto compliance

diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index c02d183..2119324 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.spec
+++ b/dists/rpm/tizen/packaging/tlm.spec
@@ -14,7 +14,7 @@
 
 Name:    tlm
 Summary: Login manager for Tizen
-Version: 1.0.2
+Version: 1.0.3
 Release: 0
 Group:   System/Service
 License: LGPL-2.1+
@@ -70,7 +70,7 @@ Documentation files for %{name}.
 Summary:    Configuration files for common-profile
 Group:      System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
+Provides:   %{name}-config
 
 %description config-common
 Tizen Login Manager configuration files for common-profile.
@@ -81,20 +81,48 @@ Tizen Login Manager configuration files for common-profile.
 Summary:    Configuration files for ivi-profile with single seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
-Conflicts:  tlm-config-ivi-multiseat, tlm-config-ivi-vtc1010
+Provides:   %{name}-config
 
 %description config-ivi-singleseat
 Generic Tizen Login Manager configuration files for ivi-profile with
 single seat.
 
 
+%package config-ivi-singleseat-modello
+Summary:    Configuration files for ivi-profile with single seat for modello
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   Modello-Homescreen
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-ico
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+
+%description config-ivi-singleseat-modello
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat for modello.
+
+
+%package config-ivi-singleseat-ico
+Summary:    Configuration files for ivi-profile with single seat for ico
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   ico-uxf-homescreen
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+
+%description config-ivi-singleseat-ico
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat for ico.
+
+
 %package config-ivi-multiseat
 Summary:    Configuration files for ivi-profile with multi seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
-Conflicts:  tlm-config-ivi-singleseat, tlm-config-ivi-vtc1010
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-vtc1010
 
 %description config-ivi-multiseat
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -105,8 +133,9 @@ multi seat.
 Summary:    Configuration files for ivi-profile on VTC-1010
 Group:      System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
-Conflicts:  tlm-config-ivi-singleseat, tlm-config-ivi-multiseat
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-multiseat
 
 %description config-ivi-vtc1010
 Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.
@@ -147,6 +176,8 @@ install -m 755 data/tizen-ivi/etc/session.d/* %{buildroot}%{_sysconfdir}/session
 install -m 644 data/tizen-ivi/weston-*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
 install -m 755 -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
+install -m 755 -d %{buildroot}%{_sysconfdir}/profile.d
+install -m 644 data/tizen-ivi/etc/profile.d/* %{buildroot}%{_sysconfdir}/profile.d/
 %else
 install -m 644 data/tizen-common/etc/tlm.conf %{buildroot}%{_sysconfdir}
 install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
@@ -198,6 +229,44 @@ if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
 fi
 
 
+%post config-ivi-singleseat-modello
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-modello.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-singleseat-modello
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-singleseat-modello
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-singleseat-ico
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-ico.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-singleseat-ico
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-singleseat-ico
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
 %post config-ivi-multiseat
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
        ln -s -f /etc/tlm-multiseat.conf /etc/tlm.conf
@@ -286,10 +355,31 @@ 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-ico
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-singleseat-modello
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-singleseat-ico
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-singleseat-ico.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 
 
 %files config-ivi-multiseat
@@ -298,10 +388,9 @@ 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-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
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 
 
 %files config-ivi-vtc1010
@@ -310,11 +399,10 @@ 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-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/*
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 
 %endif
 

diff --git a/dists/rpm/tlm-suse.spec b/dists/rpm/tlm-suse.spec
index 61f19ed..8f2da1b 100644 (file)
--- a/dists/rpm/tlm-suse.spec
+++ b/dists/rpm/tlm-suse.spec
@@ -4,7 +4,7 @@
 
 Name: tlm
 Summary: Login manager for Tizen
-Version: 1.0.2
+Version: 1.0.3
 Release: 0
 Group: System/Daemons
 License: LGPL-2.1+
@@ -100,6 +100,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Dec 23 2014 Imran Zaman <imran.zaman@intel.com>
+- Added config package for modello
+
 * Mon Dec 15 2014 Imran Zaman <imran.zaman@intel.com>
 - set PAM_TTY to the to-be-session-TTY
 - cleaned up spec file for yocto compliance

diff --git a/docs/html/api-index-full.html b/docs/html/api-index-full.html
index dd1983b..193f3cb 100644 (file)
--- a/docs/html/api-index-full.html
+++ b/docs/html/api-index-full.html
@@ -237,11 +237,11 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="tlm-Errors.html#TLM-ERROR:CAPS" title="TLM_ERROR">TLM_ERROR</a>, macro in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
+<a class="link" href="tlm-Errors.html#TlmError" title="enum TlmError">TlmError</a>, enum in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="tlm-Errors.html#TlmError" title="enum TlmError">TlmError</a>, enum in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
+<a class="link" href="tlm-Errors.html#TLM-ERROR:CAPS" title="TLM_ERROR">TLM_ERROR</a>, macro in <a class="link" href="tlm-Errors.html" title="Errors">Errors</a>
 </dt>
 <dd></dd>
 <dt>

diff --git a/packaging/tlm.changes b/packaging/tlm.changes
index dc460bd..165a00c 100644 (file)
--- a/packaging/tlm.changes
+++ b/packaging/tlm.changes
@@ -1,3 +1,6 @@
+* Tue Dec 23 2014 Imran Zaman <imran.zaman@intel.com>
+- Added config package for modello
+
 * Mon Dec 15 2014 Imran Zaman <imran.zaman@intel.com>
 - set PAM_TTY to the to-be-session-TTY
 - cleaned up spec file for yocto compliance

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index c02d183..2119324 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -14,7 +14,7 @@
 
 Name:    tlm
 Summary: Login manager for Tizen
-Version: 1.0.2
+Version: 1.0.3
 Release: 0
 Group:   System/Service
 License: LGPL-2.1+
@@ -70,7 +70,7 @@ Documentation files for %{name}.
 Summary:    Configuration files for common-profile
 Group:      System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
+Provides:   %{name}-config
 
 %description config-common
 Tizen Login Manager configuration files for common-profile.
@@ -81,20 +81,48 @@ Tizen Login Manager configuration files for common-profile.
 Summary:    Configuration files for ivi-profile with single seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
-Conflicts:  tlm-config-ivi-multiseat, tlm-config-ivi-vtc1010
+Provides:   %{name}-config
 
 %description config-ivi-singleseat
 Generic Tizen Login Manager configuration files for ivi-profile with
 single seat.
 
 
+%package config-ivi-singleseat-modello
+Summary:    Configuration files for ivi-profile with single seat for modello
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   Modello-Homescreen
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-ico
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+
+%description config-ivi-singleseat-modello
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat for modello.
+
+
+%package config-ivi-singleseat-ico
+Summary:    Configuration files for ivi-profile with single seat for ico
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Requires:   ico-uxf-homescreen
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-multiseat, %{name}-config-ivi-vtc1010
+
+%description config-ivi-singleseat-ico
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat for ico.
+
+
 %package config-ivi-multiseat
 Summary:    Configuration files for ivi-profile with multi seat
 Group:     System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
-Conflicts:  tlm-config-ivi-singleseat, tlm-config-ivi-vtc1010
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-vtc1010
 
 %description config-ivi-multiseat
 Generic Tizen Login Manager configuration files for ivi-profile with
@@ -105,8 +133,9 @@ multi seat.
 Summary:    Configuration files for ivi-profile on VTC-1010
 Group:      System/Service
 Requires:   %{name} = %{version}-%{release}
-Provides:   tlm-config
-Conflicts:  tlm-config-ivi-singleseat, tlm-config-ivi-multiseat
+Provides:   %{name}-config
+Conflicts:  %{name}-config-ivi-singleseat, %{name}-config-ivi-singleseat-modello
+Conflicts:  %{name}-config-ivi-singleseat-ico, %{name}-config-ivi-multiseat
 
 %description config-ivi-vtc1010
 Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.
@@ -147,6 +176,8 @@ install -m 755 data/tizen-ivi/etc/session.d/* %{buildroot}%{_sysconfdir}/session
 install -m 644 data/tizen-ivi/weston-*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
 install -m 755 -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
+install -m 755 -d %{buildroot}%{_sysconfdir}/profile.d
+install -m 644 data/tizen-ivi/etc/profile.d/* %{buildroot}%{_sysconfdir}/profile.d/
 %else
 install -m 644 data/tizen-common/etc/tlm.conf %{buildroot}%{_sysconfdir}
 install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
@@ -198,6 +229,44 @@ if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
 fi
 
 
+%post config-ivi-singleseat-modello
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-modello.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-singleseat-modello
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-singleseat-modello
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-singleseat-ico
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-ico.conf /etc/tlm.conf
+fi
+systemctl enable tlm
+systemctl daemon-reload
+
+%preun config-ivi-singleseat-ico
+if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+fi
+
+%postun config-ivi-singleseat-ico
+if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+fi
+
+
 %post config-ivi-multiseat
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
        ln -s -f /etc/tlm-multiseat.conf /etc/tlm.conf
@@ -286,10 +355,31 @@ 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-ico
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-singleseat-modello
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
 %config(noreplace) %{_sysconfdir}/session.d/user-session-modello
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
+
+
+%files config-ivi-singleseat-ico
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm-singleseat-ico.conf
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
+%config(noreplace) %{_sysconfdir}/session.d/user-session-ico
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 
 
 %files config-ivi-multiseat
@@ -298,10 +388,9 @@ 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-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
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 
 
 %files config-ivi-vtc1010
@@ -310,11 +399,10 @@ 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-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/*
+%config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 
 %endif