Add multi-configuration for Tizen IVI and Tizen Common

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

diff --git a/configure b/configure
index ccae522..2be9f36 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.0.
+# Generated by GNU Autoconf 2.69 for tlm 1.0.1.
 #
 #
 # 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.0'
-PACKAGE_STRING='tlm 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='tlm 1.0.1'
 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.0 to adapt to many kinds of systems.
+\`configure' configures tlm 1.0.1 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.0:";;
+     short | recursive ) echo "Configuration of tlm 1.0.1:";;
    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.0
+tlm configure 1.0.1
 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.0, which was
+It was created by tlm $as_me 1.0.1, 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.0'
+ VERSION='1.0.1'
 
 
 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.0, which was
+This file was extended by tlm $as_me 1.0.1, 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.0
+tlm config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index dbf3e86..3eada6d 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.0], [])
+AC_INIT([tlm], [1.0.1], [])
 AC_CONFIG_SRCDIR([src/daemon/tlm-main.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/data/tizen-common/weston-display.ini b/data/tizen-common/weston-display.ini
new file mode 100644 (file)
index 0000000..23a2dc9
--- /dev/null
+++ b/data/tizen-common/weston-display.ini
@@ -0,0 +1,63 @@
+[core]
+modules=desktop-shell.so
+
+[shell]
+background-image=/usr/share/backgrounds/tizen/current
+background-color=0xff002244
+background-type=scale-crop
+panel-color=0x95333333
+locking=true
+panel-location=none
+animation=zoom
+#binding-modifier=ctrl
+num-workspaces=4
+#cursor-theme=whiteglass
+#cursor-size=24
+startup-animation=fade
+
+#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png
+#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg
+#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg
+
+## weston
+
+[launcher]
+icon=/usr/share/icons/tizen/32x32/terminal.png
+path=/usr/bin/weston-terminal
+
+[screensaver]
+# Uncomment path to disable screensaver
+duration=600
+
+[input-method]
+path=/usr/libexec/weston-keyboard
+#path=/bin/weekeyboard
+
+#[keyboard]
+#keymap_layout=fr
+
+#[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
+default_output=1
+

diff --git a/data/tizen-common/weston-user.ini b/data/tizen-common/weston-user.ini
new file mode 100644 (file)
index 0000000..ac37b5a
--- /dev/null
+++ b/data/tizen-common/weston-user.ini
@@ -0,0 +1,63 @@
+[core]
+modules=desktop-shell.so
+
+[shell]
+background-image=/usr/share/backgrounds/tizen/current
+background-color=0xff002244
+background-type=scale-crop
+panel-color=0x95333333
+locking=true
+panel-location=none
+animation=zoom
+#binding-modifier=ctrl
+num-workspaces=4
+#cursor-theme=whiteglass
+#cursor-size=24
+startup-animation=fade
+
+#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png
+#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg
+#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg
+
+## weston
+
+[launcher]
+icon=/usr/share/icons/tizen/32x32/terminal.png
+path=/usr/bin/weston-terminal
+
+[screensaver]
+# Uncomment path to disable screensaver
+duration=600
+
+[input-method]
+path=/usr/libexec/weston-keyboard
+#path=/bin/weekeyboard
+
+#[keyboard]
+#keymap_layout=fr
+
+#[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
+#default_output=1
+

diff --git a/data/tizen-ivi/10-multiseat-vtc1010.rules b/data/tizen-ivi/10-multiseat-vtc1010.rules
new file mode 100644 (file)
index 0000000..45184a7
--- /dev/null
+++ b/data/tizen-ivi/10-multiseat-vtc1010.rules
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+ACTION=="remove", GOTO="seat_end"
+
+SUBSYSTEM=="usb", ATTR{idVendor}=="05e3", ATTR{idProduct}=="0608", ENV{ID_AUTOSEAT}="1", ENV{ID_SEAT}="seat1", ENV{WL_SEAT}+="seat1", TAG+="master-of-seat"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1a40", ATTR{idProduct}=="0101", ENV{ID_AUTOSEAT}="1", ENV{ID_SEAT}="seat2", ENV{WL_SEAT}+="seat2", TAG+="master-of-seat"
+ 
+ACTION=="add", SUBSYSTEM=="input",DEVPATH=="/devices/pci0000:00/0000:00:1d.0/usb1/1-1/1-1.1/*", ENV{WL_SEAT}+="seat1", ENV{WL_OUTPUT}="VGA1"
+ACTION=="add", SUBSYSTEM=="input",DEVPATH=="/devices/pci0000:00/0000:00:1d.0/usb1/1-1/1-1.2/*", ENV{WL_SEAT}+="seat2", ENV{WL_OUTPUT}="DP1"
+
+LABEL="seat_end"

diff --git a/data/tizen-ivi/etc/session.d/genivi-session b/data/tizen-ivi/etc/session.d/genivi-session-multiseat
similarity index 59%
rename from data/tizen-ivi/etc/session.d/genivi-session
rename to data/tizen-ivi/etc/session.d/genivi-session-multiseat
index 935cc2d..09e4d0c 100755 (executable)
--- a/data/tizen-ivi/etc/session.d/genivi-session
+++ b/data/tizen-ivi/etc/session.d/genivi-session-multiseat
@@ -1,10 +1,7 @@
 #!/bin/sh
 #
 export WAYLAND_SERVER_DIR=/tmp
-#mkdir /run/memory/display
-#chmod 0750 /run/memory/display
-#chgrp weston-launch /run/memory/display
-#export WAYLAND_SERVER_DIR=/run/memory/display
 export WAYLAND_SERVER_GROUP=weston-launch
 export WAYLAND_SERVER_MODE=0660
+export WESTON_CONFIG=/etc/xdg/weston/weston-genivi.ini
 /usr/bin/weston-launch -- -i0 --current-mode --log=/tmp/genivi-weston.log --shell=desktop-shell.so

diff --git a/data/tizen-ivi/etc/session.d/genivi-session-singleseat b/data/tizen-ivi/etc/session.d/genivi-session-singleseat
new file mode 100755 (executable)
index 0000000..e7056dd
--- /dev/null
+++ b/data/tizen-ivi/etc/session.d/genivi-session-singleseat
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+export WAYLAND_SERVER_DIR=/tmp
+export WAYLAND_SERVER_GROUP=weston-launch
+export WAYLAND_SERVER_MODE=0660
+export WESTON_CONFIG=/etc/xdg/weston/weston-genivi.ini
+/usr/bin/weston-launch -- -i0 --current-mode --log=/tmp/genivi-weston.log

diff --git a/data/tizen-ivi/etc/session.d/genivi-session-vtc1010 b/data/tizen-ivi/etc/session.d/genivi-session-vtc1010
new file mode 100755 (executable)
index 0000000..8911190
--- /dev/null
+++ b/data/tizen-ivi/etc/session.d/genivi-session-vtc1010
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+export WAYLAND_SERVER_DIR=/tmp
+export WAYLAND_SERVER_GROUP=weston-launch
+export WAYLAND_SERVER_MODE=0660
+export WESTON_CONFIG=/etc/xdg/weston/weston-genivi-vtc1010.ini
+/usr/bin/weston-launch -- -i0 --current-mode --log=/tmp/genivi-weston.log

diff --git a/data/tizen-ivi/etc/session.d/user-session b/data/tizen-ivi/etc/session.d/user-session
index e030e44..cbfa16c 100755 (executable)
--- a/data/tizen-ivi/etc/session.d/user-session
+++ b/data/tizen-ivi/etc/session.d/user-session
@@ -2,5 +2,5 @@
 #
 export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
 export WAYLAND_CLIENT_DIR=/tmp
-weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so --width=960 --height=1080
-#weston-terminal
+export WESTON_CONFIG=/etc/xdg/weston/weston-user.ini
+weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so

diff --git a/data/tizen-ivi/etc/session.d/user-session.ivi b/data/tizen-ivi/etc/session.d/user-session.modello
similarity index 58%
rename from data/tizen-ivi/etc/session.d/user-session.ivi
rename to data/tizen-ivi/etc/session.d/user-session.modello
index 7b4d2f6..0f9f15a 100755 (executable)
--- a/data/tizen-ivi/etc/session.d/user-session.ivi
+++ b/data/tizen-ivi/etc/session.d/user-session.modello
@@ -2,5 +2,7 @@
 #
 export DBUS_SESSION_BUS_ADDRESS=unix:path=$XDG_RUNTIME_DIR/dbus/user_bus_socket
 export WAYLAND_CLIENT_DIR=/tmp
-weston --log=$XDG_RUNTIME_DIR/weston.log --backend=wayland-backend.so --width=960 --height=1080 &
+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/tlm-multiseat.conf b/data/tizen-ivi/etc/tlm-multiseat.conf
new file mode 100644 (file)
index 0000000..57e0113
--- /dev/null
+++ b/data/tizen-ivi/etc/tlm-multiseat.conf
@@ -0,0 +1,87 @@
+#
+# Configuration file for multi 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=3
+#
+#
+# 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-multiseat
+DEFAULT_PAM_SERVICE=tlm-system-login
+SETUP_RUNTIME_DIR=1
+#
+[seat1]
+DEFAULT_USER=alice
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/tmp/wayland-0.lock
+#
+[seat2]
+DEFAULT_USER=bob
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/tmp/wayland-0.lock
+#
+#
+# plugin specific settings.
+#
+#[pluginname]
+#
+

diff --git a/data/tizen-ivi/etc/tlm.conf b/data/tizen-ivi/etc/tlm-singleseat.conf
similarity index 86%
rename from data/tizen-ivi/etc/tlm.conf
rename to data/tizen-ivi/etc/tlm-singleseat.conf
index 7408cc3..cc3367c 100644 (file)
--- a/data/tizen-ivi/etc/tlm.conf
+++ b/data/tizen-ivi/etc/tlm-singleseat.conf
@@ -1,5 +1,5 @@
 #
-# Example configuration for tlm.
+# Configuration file for single seat TLM.
 #
 
 #
@@ -63,20 +63,13 @@ NSEATS=2
 DEFAULT_USER=genivi
 SETUP_TERMINAL=1
 VTNR=7
-SESSION_CMD=/etc/session.d/genivi-session
-#SESSION_CMD=bash
-#SESSION_CMD=weston
+SESSION_CMD=/etc/session.d/genivi-session-singleseat
 DEFAULT_PAM_SERVICE=tlm-system-login
 SETUP_RUNTIME_DIR=1
-#RUNTIME_MODE=0755
 #
 [seat1]
 DEFAULT_USER=app
 SESSION_CMD=/etc/session.d/user-session
-#DEFAULT_PAM_SERVICE=tlm-system-login
-#SETUP_RUNTIME_DIR=1
-#ACTIVE=0
-#DEFAULT_USER=guest_%S
 NWATCH=1
 WATCH0=/tmp/wayland-0.lock
 #

diff --git a/data/tizen-ivi/etc/tlm-vtc1010.conf b/data/tizen-ivi/etc/tlm-vtc1010.conf
new file mode 100644 (file)
index 0000000..31de742
--- /dev/null
+++ b/data/tizen-ivi/etc/tlm-vtc1010.conf
@@ -0,0 +1,87 @@
+#
+# Configuration file for multi seat TLM on VTC1010.
+#
+
+#
+# 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=3
+#
+#
+# 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-vtc1010
+DEFAULT_PAM_SERVICE=tlm-system-login
+SETUP_RUNTIME_DIR=1
+#
+[seat1]
+DEFAULT_USER=alice
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/tmp/wayland-0.lock
+#
+[seat2]
+DEFAULT_USER=bob
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/tmp/wayland-0.lock
+#
+#
+# plugin specific settings.
+#
+#[pluginname]
+#
+

diff --git a/data/tizen-ivi/weston-genivi-vtc1010.ini b/data/tizen-ivi/weston-genivi-vtc1010.ini
new file mode 100644 (file)
index 0000000..d699d7f
--- /dev/null
+++ b/data/tizen-ivi/weston-genivi-vtc1010.ini
@@ -0,0 +1,44 @@
+[core]
+#modules=cms-colord.so
+shell=fullscreen-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
+
+[input-method]
+path=/usr/libexec/weston-keyboard
+
+[output]
+name=VGA1
+seat=seat1
+
+[output]
+name=DP1
+seat=seat2
+
+#[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

diff --git a/data/tizen-ivi/weston-genivi.ini b/data/tizen-ivi/weston-genivi.ini
new file mode 100644 (file)
index 0000000..e0d4d58
--- /dev/null
+++ b/data/tizen-ivi/weston-genivi.ini
@@ -0,0 +1,36 @@
+[core]
+#modules=cms-colord.so
+shell=fullscreen-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
+
+[input-method]
+path=/usr/libexec/weston-keyboard
+
+#[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

diff --git a/data/tizen-ivi/weston-user.ini b/data/tizen-ivi/weston-user.ini
new file mode 100644 (file)
index 0000000..7d73b01
--- /dev/null
+++ b/data/tizen-ivi/weston-user.ini
@@ -0,0 +1,36 @@
+[core]
+#modules=cms-colord.so
+#shell=fullscreen-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
+
+[input-method]
+path=/usr/libexec/weston-keyboard
+
+#[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

diff --git a/dists/debian/changelog b/dists/debian/changelog
index b539d71..9e90b0f 100644 (file)
--- a/dists/debian/changelog
+++ b/dists/debian/changelog
@@ -1,3 +1,9 @@
+tlm (1.0.1-0) unstable; urgency=low
+
+  * Add multi-configuration for Tizen IVI and Tizen Common
+
+ -- Imran Zaman <imran.zaman@intel.com>  Mon, 24 Nov 2014 17:56:53 +0200
+
 tlm (1.0.0-0) unstable; urgency=low
 
   * Build package with profile specific configuration

diff --git a/dists/rpm/tizen/packaging/tlm.changes b/dists/rpm/tizen/packaging/tlm.changes
index 12d77cc..37f220e 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.changes
+++ b/dists/rpm/tizen/packaging/tlm.changes
@@ -1,3 +1,6 @@
+* Mon Nov 24 2014 Imran Zaman <imran.zaman@intel.com>
+- Add multi-configuration for Tizen IVI and Tizen Common
+
 * Mon Nov 17 2014 Imran Zaman <imran.zaman@intel.com>
 - Build package with profile specific configuration
 

diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index 262ab50..68192bb 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.0
+Version: 1.0.1
 Release: 0
 Group: System/Service
 License: LGPL-2.1+
@@ -39,9 +39,8 @@ BuildRequires: gtk-doc
 BuildRequires: pkgconfig(elementary)
 %endif
 
-
 %description
-%{summary} files
+Login manager daemon for Tizen.
 
 
 %package devel
@@ -49,9 +48,8 @@ Summary:    Development files for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
-
 %description devel
-%{summary} files
+%{summary} package.
 
 
 %package doc
@@ -59,9 +57,58 @@ Summary:    Documentation files for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
-
 %description doc
-%{summary} files
+%{summary} package.
+
+
+%if "%{profile}" != "ivi"
+
+%package config-common
+Summary:    Configuration files for common-profile
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Provides:   tlm-config
+
+%description config-common
+Tizen Login Manager configuration files for common-profile.
+
+%else
+
+%package config-ivi-singleseat
+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
+
+%description config-ivi-singleseat
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat.
+
+
+%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
+
+%description config-ivi-multiseat
+Generic Tizen Login Manager configuration files for ivi-profile with
+multi seat.
+
+
+%package config-ivi-vtc1010
+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
+
+%description config-ivi-vtc1010
+Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.
+
+%endif
 
 
 %prep
@@ -82,6 +129,7 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 %make_install
+rm -f %{buildroot}%{_sysconfdir}/tlm.conf
 install -m 755 -d %{buildroot}%{_unitdir}
 install -m 644 data/tlm.service %{buildroot}%{_unitdir}
 install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
@@ -89,12 +137,17 @@ install -m 644 data/tlm-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-default-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-system-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 755 -d %{buildroot}%{_sysconfdir}/session.d
+install -m 755 -d %{buildroot}%{_sysconfdir}/xdg/weston
 %if "%{profile}" == "ivi"
-install -m 644 data/tizen-ivi/etc/tlm.conf %{buildroot}%{_sysconfdir}
+install -m 644 data/tizen-ivi/etc/tlm*.conf %{buildroot}%{_sysconfdir}
 install -m 755 data/tizen-ivi/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
+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/
 %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/
+install -m 644 data/tizen-common/weston-*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
 %endif
 
 
@@ -110,6 +163,43 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 /usr/bin/systemctl daemon-reload
 
 
+%if "%{profile}" == "ivi"
+
+%post config-ivi-singleseat
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+ln -s -f /etc/tlm-singleseat.conf /etc/tlm.conf
+fi
+
+%postun config-ivi-singleseat
+if [ -h /etc/tlm.conf ]; 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
+fi
+
+%postun config-ivi-multiseat
+if [ -h /etc/tlm.conf ]; then
+rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-vtc1010
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+ln -s -f /etc/tlm-vtc1010.conf /etc/tlm.conf
+fi
+
+%postun config-ivi-vtc1010
+if [ -h /etc/tlm.conf ]; then
+rm -f /etc/tlm.conf
+fi
+
+%endif
+
+
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
@@ -121,11 +211,9 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 %{_libdir}/lib%{name}*.so.*
 %{_libdir}/%{name}/plugins/*.so*
 %{_unitdir}/tlm.service
-%config(noreplace) %{_sysconfdir}/tlm.conf
 %config %{_sysconfdir}/pam.d/tlm-login
 %config %{_sysconfdir}/pam.d/tlm-default-login
 %config %{_sysconfdir}/pam.d/tlm-system-login
-%config(noreplace) %{_sysconfdir}/session.d/*
 
 
 %files devel
@@ -141,3 +229,51 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 %files doc
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/tlm/*
+
+
+%if "%{profile}" != "ivi"
+
+%files config-common
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm.conf
+%config(noreplace) %{_sysconfdir}/session.d/*
+%config(noreplace) %{_sysconfdir}/xdg/weston/*
+
+%else
+
+%files config-ivi-singleseat
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%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}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+
+
+%files config-ivi-multiseat
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%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}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+
+
+%files config-ivi-vtc1010
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%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}/xdg/weston/weston-genivi-vtc1010.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+
+%endif
+

diff --git a/dists/rpm/tlm-suse.spec b/dists/rpm/tlm-suse.spec
index 905836a..55209d9 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.0
+Version: 1.0.1
 Release: 0
 Group: System/Daemons
 License: LGPL-2.1+
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 24 2014 Imran Zaman <imran.zaman@intel.com>
+- Add multi-configuration for Tizen IVI and Tizen Common
+
 * Mon Nov 17 2014 Imran Zaman <imran.zaman@intel.com>
 - Build package with profile specific configuration
 

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 12d77cc..37f220e 100644 (file)
--- a/packaging/tlm.changes
+++ b/packaging/tlm.changes
@@ -1,3 +1,6 @@
+* Mon Nov 24 2014 Imran Zaman <imran.zaman@intel.com>
+- Add multi-configuration for Tizen IVI and Tizen Common
+
 * Mon Nov 17 2014 Imran Zaman <imran.zaman@intel.com>
 - Build package with profile specific configuration
 

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index 262ab50..68192bb 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -14,7 +14,7 @@
 
 Name: tlm
 Summary: Login manager for Tizen
-Version: 1.0.0
+Version: 1.0.1
 Release: 0
 Group: System/Service
 License: LGPL-2.1+
@@ -39,9 +39,8 @@ BuildRequires: gtk-doc
 BuildRequires: pkgconfig(elementary)
 %endif
 
-
 %description
-%{summary} files
+Login manager daemon for Tizen.
 
 
 %package devel
@@ -49,9 +48,8 @@ Summary:    Development files for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
-
 %description devel
-%{summary} files
+%{summary} package.
 
 
 %package doc
@@ -59,9 +57,58 @@ Summary:    Documentation files for %{name}
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
-
 %description doc
-%{summary} files
+%{summary} package.
+
+
+%if "%{profile}" != "ivi"
+
+%package config-common
+Summary:    Configuration files for common-profile
+Group:      System/Service
+Requires:   %{name} = %{version}-%{release}
+Provides:   tlm-config
+
+%description config-common
+Tizen Login Manager configuration files for common-profile.
+
+%else
+
+%package config-ivi-singleseat
+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
+
+%description config-ivi-singleseat
+Generic Tizen Login Manager configuration files for ivi-profile with
+single seat.
+
+
+%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
+
+%description config-ivi-multiseat
+Generic Tizen Login Manager configuration files for ivi-profile with
+multi seat.
+
+
+%package config-ivi-vtc1010
+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
+
+%description config-ivi-vtc1010
+Tizen Login Manager configuration files for ivi-profile on VTC-1010 hardware.
+
+%endif
 
 
 %prep
@@ -82,6 +129,7 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 %make_install
+rm -f %{buildroot}%{_sysconfdir}/tlm.conf
 install -m 755 -d %{buildroot}%{_unitdir}
 install -m 644 data/tlm.service %{buildroot}%{_unitdir}
 install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
@@ -89,12 +137,17 @@ install -m 644 data/tlm-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-default-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-system-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 755 -d %{buildroot}%{_sysconfdir}/session.d
+install -m 755 -d %{buildroot}%{_sysconfdir}/xdg/weston
 %if "%{profile}" == "ivi"
-install -m 644 data/tizen-ivi/etc/tlm.conf %{buildroot}%{_sysconfdir}
+install -m 644 data/tizen-ivi/etc/tlm*.conf %{buildroot}%{_sysconfdir}
 install -m 755 data/tizen-ivi/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
+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/
 %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/
+install -m 644 data/tizen-common/weston-*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
 %endif
 
 
@@ -110,6 +163,43 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 /usr/bin/systemctl daemon-reload
 
 
+%if "%{profile}" == "ivi"
+
+%post config-ivi-singleseat
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+ln -s -f /etc/tlm-singleseat.conf /etc/tlm.conf
+fi
+
+%postun config-ivi-singleseat
+if [ -h /etc/tlm.conf ]; 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
+fi
+
+%postun config-ivi-multiseat
+if [ -h /etc/tlm.conf ]; then
+rm -f /etc/tlm.conf
+fi
+
+
+%post config-ivi-vtc1010
+if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+ln -s -f /etc/tlm-vtc1010.conf /etc/tlm.conf
+fi
+
+%postun config-ivi-vtc1010
+if [ -h /etc/tlm.conf ]; then
+rm -f /etc/tlm.conf
+fi
+
+%endif
+
+
 %files
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
@@ -121,11 +211,9 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 %{_libdir}/lib%{name}*.so.*
 %{_libdir}/%{name}/plugins/*.so*
 %{_unitdir}/tlm.service
-%config(noreplace) %{_sysconfdir}/tlm.conf
 %config %{_sysconfdir}/pam.d/tlm-login
 %config %{_sysconfdir}/pam.d/tlm-default-login
 %config %{_sysconfdir}/pam.d/tlm-system-login
-%config(noreplace) %{_sysconfdir}/session.d/*
 
 
 %files devel
@@ -141,3 +229,51 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 %files doc
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/tlm/*
+
+
+%if "%{profile}" != "ivi"
+
+%files config-common
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%config(noreplace) %{_sysconfdir}/tlm.conf
+%config(noreplace) %{_sysconfdir}/session.d/*
+%config(noreplace) %{_sysconfdir}/xdg/weston/*
+
+%else
+
+%files config-ivi-singleseat
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%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}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+
+
+%files config-ivi-multiseat
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%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}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+
+
+%files config-ivi-vtc1010
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%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}/xdg/weston/weston-genivi-vtc1010.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-user.ini
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+
+%endif
+