Merge "Enable Multiuser environment" into tizensubmit/tizen_common/20140602.071652submit/tizen_common/20140530.021300submit/tizen_common/20140529.194900submit/tizen_common/20140528.183233submit/tizen_common/20140527.145440

1 files changed, 70 insertions, 66 deletions

diff --git a/tizen-platform.meta b/tizen-platform.meta
index ad4685f..20b14cc 100644
--- a/tizen-platform.meta
+++ b/tizen-platform.meta
@@ -5,51 +5,35 @@
 ############# Base dirs #############
 
 # Tizen 3 (single user):
-TZ_SYS_HOME=/opt/home
-TZ_SYS_ROOT=/opt/home/root
-TZ_SYS_SHARE=/opt/share
-TZ_SYS_ETC=/opt/etc
-TZ_SYS_DATA=/opt/data
-TZ_SYS_BIN=/usr/bin
-TZ_SYS_SMACK=/opt/etc/smack
-TZ_SYS_STORAGE=/opt/storage
-TZ_SYS_USER_GROUP=app
-
-# Tizen 3 (multi user):
 #TZ_SYS_HOME=/home
-#TZ_SYS_ROOT=/opt/root
-#TZ_SYS_SHARE=/usr/share
-#TZ_SYS_ETC=/etc
+#TZ_SYS_ROOT=/opt/home/root
+#TZ_SYS_SHARE=/opt/share
+#TZ_SYS_ETC=/opt/etc
 #TZ_SYS_DATA=/opt/data
 #TZ_SYS_BIN=/usr/bin
-#TZ_SYS_SMACK=/etc/smack
+#TZ_SYS_SMACK=/opt/etc/smack
+#TZ_SYS_STORAGE=/opt/storage
+#TZ_SYS_USER_GROUP=app
+
+# Tizen 3 (multi user):
+TZ_SYS_HOME=/home
+TZ_SYS_ROOT=/root
+TZ_SYS_SHARE=/usr/share
+TZ_SYS_ETC=/etc
+TZ_SYS_DATA=/usr/data
+TZ_SYS_BIN=/usr/bin
+TZ_SYS_SMACK=/etc/smack
+TZ_SYS_STORAGE=/usr/storage
+TZ_SYS_USER_GROUP=users
 
 ############# Core & Framework dirs #############
 
 # Tizen 3 (single user):
-TZ_SYS_DB=/opt/dbspace
-TZ_SYS_CONFIG=/opt/var/kdb
-TZ_SYS_RW_APP=/opt/apps
-TZ_SYS_RO_APP=/usr/apps
-TZ_SYS_APP_PREINSTALL=/opt/usr/apps/.preinstallWidgets
-TZ_SYS_RW_WIDGET=/opt/share/widget
-TZ_SYS_RO_WIDGET=/usr/share/widget
-TZ_SYS_RW_DESKTOP_APP=/opt/share/applications
-TZ_SYS_RO_DESKTOP_APP=/usr/share/applications
-TZ_SYS_RW_WRT_ENGINE=/opt/share/wrt-engine
-TZ_SYS_RO_WRT_ENGINE=/usr/share/wrt-engine
-TZ_SYS_RW_PACKAGES=/opt/share/packages
-TZ_SYS_RO_PACKAGES=/usr/share/packages
-TZ_SYS_WRT_CONF=/usr/etc/wrt
-TZ_SYS_WRT_PLUGINS_CONF=/usr/etc/wrt-plugins
-TZ_SYS_TIZEN_APIS_CONF=/usr/etc/tizen-apis
-TZ_SYS_ACE_CONF=/usr/etc/ace
-
-# Tizen 3 (multi user):
 #TZ_SYS_DB=/opt/dbspace
-#TZ_SYS_CONFIG=/opt/kdb
+#TZ_SYS_CONFIG=/opt/var/kdb
 #TZ_SYS_RW_APP=/opt/apps
 #TZ_SYS_RO_APP=/usr/apps
+#TZ_SYS_APP_PREINSTALL=/opt/usr/apps/.preinstallWidgets
 #TZ_SYS_RW_WIDGET=/opt/share/widget
 #TZ_SYS_RO_WIDGET=/usr/share/widget
 #TZ_SYS_RW_DESKTOP_APP=/opt/share/applications
@@ -58,9 +42,27 @@ TZ_SYS_ACE_CONF=/usr/etc/ace
 #TZ_SYS_RO_WRT_ENGINE=/usr/share/wrt-engine
 #TZ_SYS_RW_PACKAGES=/opt/share/packages
 #TZ_SYS_RO_PACKAGES=/usr/share/packages
-#TZ_SYS_WRT_PLUGINS_CONF=/etc/wrt-plugins
-#TZ_SYS_TIZEN_APIS_CONF=/etc/tizen-apis
-#TZ_SYS_ACE_CONF=/etc/ace
+#TZ_SYS_WRT_CONF=/usr/etc/wrt
+#TZ_SYS_WRT_PLUGINS_CONF=/usr/etc/wrt-plugins
+#TZ_SYS_TIZEN_APIS_CONF=/usr/etc/tizen-apis
+#TZ_SYS_ACE_CONF=/usr/etc/ace
+
+# Tizen 3 (multi user):
+TZ_SYS_DB=/usr/dbspace
+TZ_SYS_CONFIG=/usr/kdb
+TZ_SYS_RW_APP=/usr/apps
+TZ_SYS_RO_APP=/usr/apps
+TZ_SYS_RW_WIDGET=/usr/share/widget
+TZ_SYS_RO_WIDGET=/usr/share/widget
+TZ_SYS_RW_DESKTOP_APP=/usr/share/applications
+TZ_SYS_RO_DESKTOP_APP=/usr/share/applications
+TZ_SYS_RW_WRT_ENGINE=/usr/share/wrt-engine
+TZ_SYS_RO_WRT_ENGINE=/usr/share/wrt-engine
+TZ_SYS_RW_PACKAGES=/usr/share/packages
+TZ_SYS_RO_PACKAGES=/usr/share/packages
+TZ_SYS_WRT_PLUGINS_CONF=/etc/wrt-plugins
+TZ_SYS_TIZEN_APIS_CONF=/etc/tizen-apis
+TZ_SYS_ACE_CONF=/etc/ace
 
 ############################################################
 #                   SDK VARIABLES                          #
@@ -77,46 +79,37 @@ TZ_SDK_TOOLS=$TZ_SDK_HOME/sdk_tools
 ############# Base dirs #############
 
 # Tizen 3 (single user):
-TZ_USER_NAME=app
-TZ_USER_HOME=$TZ_SYS_HOME/app
-TZ_USER_SHARE=/opt/usr/share
-TZ_USER_DATA=/opt/usr/data
-TZ_USER_ETC=/opt/usr/etc
-TZ_USER_LIVE=/opt/usr/live
+#TZ_USER_NAME=app
+#TZ_USER_HOME=$TZ_SYS_HOME/app
+#TZ_USER_SHARE=/opt/usr/share
+#TZ_USER_DATA=/opt/usr/data
+#TZ_USER_ETC=/opt/usr/etc
+#TZ_USER_LIVE=/opt/usr/live
 
 # Tizen 3 (multi user):
-#TZ_USER_NAME=$USER
-#TZ_USER_GROUP=users
-#TZ_USER_HOME=$HOME
-#TZ_USER_SHARE=$TZ_USER_HOME/share
+TZ_USER_NAME=$USER
+TZ_USER_HOME=$HOME
+TZ_USER_SHARE=$TZ_USER_HOME/share
+TZ_USER_DATA=$TZ_USER_HOME/data
+TZ_USER_ETC=$TZ_USER_HOME/etc
+TZ_USER_LIVE=$TZ_USER_HOME/live
 
 ############# Core & Framework dirs #############
 
 # Tizen 3 (single user):
-TZ_USER_DB=/opt/usr/dbspace
-TZ_USER_CONFIG=/opt/var/kdb
-TZ_USER_APP=/opt/usr/apps
+#TZ_USER_DB=/opt/usr/dbspace
+#TZ_USER_CONFIG=/opt/var/kdb
+#TZ_USER_APP=/opt/usr/apps
 
 # Tizen 3 (multi user):
-#TZ_USER_DB=$TZ_USER_HOME/dbspace
-#TZ_USER_CONFIG=$TZ_USER_HOME/kdb
-#TZ_USER_APP=$TZ_USER_HOME/apps_rw
+TZ_USER_DB=$TZ_USER_HOME/dbspace
+TZ_USER_CONFIG=$TZ_USER_HOME/kdb
+TZ_USER_APP=$TZ_USER_HOME/apps_rw
 
 ############# Content dirs #############
 
 # Tizen 3 (single user):
-TZ_USER_CONTENT=/opt/usr/media
-TZ_USER_CAMERA=$TZ_USER_CONTENT/Camera
-TZ_USER_VIDEOS=$TZ_USER_CONTENT/Videos
-TZ_USER_IMAGES=$TZ_USER_CONTENT/Images
-TZ_USER_SOUNDS=$TZ_USER_CONTENT/Sounds
-TZ_USER_GAMES=$TZ_USER_CONTENT/Games
-TZ_USER_DOCUMENTS=$TZ_USER_CONTENT/Documents
-TZ_USER_OTHERS=$TZ_USER_CONTENT/Others
-TZ_USER_DOWNLOADS=$TZ_USER_CONTENT/Downloads
-
-# Tizen 3 (multi user):
-#TZ_USER_CONTENT=$TZ_USER_HOME/content
+#TZ_USER_CONTENT=/opt/usr/media
 #TZ_USER_CAMERA=$TZ_USER_CONTENT/Camera
 #TZ_USER_VIDEOS=$TZ_USER_CONTENT/Videos
 #TZ_USER_IMAGES=$TZ_USER_CONTENT/Images
@@ -126,3 +119,14 @@ TZ_USER_DOWNLOADS=$TZ_USER_CONTENT/Downloads
 #TZ_USER_OTHERS=$TZ_USER_CONTENT/Others
 #TZ_USER_DOWNLOADS=$TZ_USER_CONTENT/Downloads
 
+# Tizen 3 (multi user):
+TZ_USER_CONTENT=$TZ_USER_HOME/content
+TZ_USER_CAMERA=$TZ_USER_CONTENT/Camera
+TZ_USER_VIDEOS=$TZ_USER_CONTENT/Videos
+TZ_USER_IMAGES=$TZ_USER_CONTENT/Images
+TZ_USER_SOUNDS=$TZ_USER_CONTENT/Sounds
+TZ_USER_GAMES=$TZ_USER_CONTENT/Games
+TZ_USER_DOCUMENTS=$TZ_USER_CONTENT/Documents
+TZ_USER_OTHERS=$TZ_USER_CONTENT/Others
+TZ_USER_DOWNLOADS=$TZ_USER_CONTENT/Downloads
+