Updated config and session scripts for Tizen Common

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

diff --git a/Makefile.am b/Makefile.am
index d734521c19f7e2083cfeea67863853ebd6a77a14..a7b28df2a668a5f245c31875232f219198918e2a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += --enable-tests
 SUBDIRS += tests
 endif
 
-EXTRA_DIST = dists tools
+EXTRA_DIST = dists tools autogen.sh
 
 valgrind:
        cd tests; make valgrind

diff --git a/Makefile.in b/Makefile.in
index ac436cc8a87ea749e386fda04f23f80fc6023c1a..44425b92398dd05f722eb54e3769c6019529b682 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -348,7 +348,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-distcheck --enable-debug \
        $(am__append_1) $(am__append_2) $(am__append_4)
 SUBDIRS = src data docs $(am__append_3) $(am__append_5)
-EXTRA_DIST = dists tools
+EXTRA_DIST = dists tools autogen.sh
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 

diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..dffeddd
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+mkdir -p m4
+gtkdocize || exit 1
+aclocal #-I m4 
+autoheader
+libtoolize --copy --force
+autoconf
+automake --add-missing --copy
+autoreconf --install --force
+$srcdir/configure "$@"
+

diff --git a/data/tizen-common/etc/session.d/display-session b/data/tizen-common/etc/session.d/display-session
deleted file mode 100755 (executable)
index 9586ee4..0000000
--- a/data/tizen-common/etc/session.d/display-session
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#
-export XDG_RUNTIME_DIR=/run/display
-/bin/sh -c 'backend=drm ; [ -d /dev/dri ] || backend=fbdev ; exec /usr/bin/weston --backend=$backend-backend.so -i0 --log=/run/display/weston.log

diff --git a/data/tizen-common/etc/session.d/user-session b/data/tizen-common/etc/session.d/user-session
index 5f3f150dfe8998a2ed1c9715c8f40d79d86ce496..920c649d811f8d710ae1c4873cc91d7301aeadf7 100755 (executable)
--- a/data/tizen-common/etc/session.d/user-session
+++ b/data/tizen-common/etc/session.d/user-session
@@ -1,5 +1,5 @@
 #!/bin/sh
 #
-export XDG_RUNTIME_DIR=/run/display
+for entries in $(/etc/sysconfig/weston-user); do export $entries; done;
 /usr/bin/ln -sf /run/display/wayland-0 /run/user/$UID/
 /bin/sh -l -c "/usr/bin/tz-launcher -c /usr/share/applications/tizen/launcher.conf $HOME/.applications/desktop"

diff --git a/data/tizen-common/etc/tlm.conf b/data/tizen-common/etc/tlm.conf
index bb27e5f46e286b158bdaeef0f155f6b931c2b38c..5988eb36c892e5a5d8d1d168c62ec1533ff012ae 100644 (file)
--- a/data/tizen-common/etc/tlm.conf
+++ b/data/tizen-common/etc/tlm.conf
@@ -55,30 +55,40 @@ DEFAULT_USER=guest_%S
 # Default: unspecified
 #SESSION_TYPE=wayland
 #
-NSEATS=2
+NSEATS=5
 #
 #
 # Seat specific settings where the group name is seat id
 [seat0]
-DEFAULT_USER=display
-SETUP_TERMINAL=1
-VTNR=7
-SESSION_CMD=/etc/session.d/display-session
-#SESSION_CMD=bash
-#SESSION_CMD=weston
-DEFAULT_PAM_SERVICE=tlm-system-login
-SETUP_RUNTIME_DIR=1
-#RUNTIME_MODE=0755
-#
-[seat1]
 DEFAULT_USER=alice
 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
+WATCH0=/run/display/wayland-0.lock
+
+[seat1]
+DEFAULT_USER=bob
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/run/display/wayland-0.lock
+
+[seat2]
+DEFAULT_USER=carol
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/run/display/wayland-0.lock
+
+[seat3]
+DEFAULT_USER=guest
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/run/display/wayland-0.lock
+
+[seat4]
+DEFAULT_USER=developer
+SESSION_CMD=/etc/session.d/user-session
+NWATCH=1
+WATCH0=/run/display/wayland-0.lock
+
 #
 #
 # plugin specific settings.

diff --git a/data/tizen-common/weston-display.ini b/data/tizen-common/weston-display.ini
deleted file mode 100644 (file)
index 23a2dc9..0000000
--- a/data/tizen-common/weston-display.ini
+++ /dev/null
@@ -1,63 +0,0 @@
-[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
deleted file mode 100644 (file)
index ac37b5a..0000000
--- a/data/tizen-common/weston-user.ini
+++ /dev/null
@@ -1,63 +0,0 @@
-[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/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index 68192bb8276997632d74fde3511182a05e96cb15..90afe3d5c391f18368327a319c15e291b2f31e79 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.spec
+++ b/dists/rpm/tizen/packaging/tlm.spec
@@ -25,6 +25,7 @@ Requires(post): /sbin/ldconfig, systemd
 Requires(postun): /sbin/ldconfig, systemd
 Requires: gumd
 Requires: libsystemd
+Requires: tlm-config
 BuildRequires: pkgconfig(glib-2.0) >= 2.30
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gio-2.0)
@@ -147,7 +148,6 @@ install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules %{buildroot}%{_sysconfd
 %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
 
 
@@ -238,7 +238,6 @@ fi
 %manifest %{name}.manifest
 %config(noreplace) %{_sysconfdir}/tlm.conf
 %config(noreplace) %{_sysconfdir}/session.d/*
-%config(noreplace) %{_sysconfdir}/xdg/weston/*
 
 %else
 

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index 68192bb8276997632d74fde3511182a05e96cb15..90afe3d5c391f18368327a319c15e291b2f31e79 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -25,6 +25,7 @@ Requires(post): /sbin/ldconfig, systemd
 Requires(postun): /sbin/ldconfig, systemd
 Requires: gumd
 Requires: libsystemd
+Requires: tlm-config
 BuildRequires: pkgconfig(glib-2.0) >= 2.30
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gio-2.0)
@@ -147,7 +148,6 @@ install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules %{buildroot}%{_sysconfd
 %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
 
 
@@ -238,7 +238,6 @@ fi
 %manifest %{name}.manifest
 %config(noreplace) %{_sysconfdir}/tlm.conf
 %config(noreplace) %{_sysconfdir}/session.d/*
-%config(noreplace) %{_sysconfdir}/xdg/weston/*
 
 %else