Separate meta file from tizen-platform-config package

To manage the meta file's variation, the meta file
is moved to new package: tizen-platform-config-meta.
And it is required by tizen-platform-config.

Change-Id: I1f9ac5ed566f2ead2682f22696631b94bced7663
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>

diff --git a/packaging/tizen-platform-config.spec b/packaging/tizen-platform-config.spec
index 91b51ed..ef01941 100644 (file)
--- a/packaging/tizen-platform-config.spec
+++ b/packaging/tizen-platform-config.spec
@@ -12,6 +12,7 @@ Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
 Source1001:     %{name}.manifest
 BuildRequires:  tizen-platform-wrapper >= 2
+BuildRequires:  tizen-platform-config-meta
 Requires(post): smack
 Requires(post): coreutils
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 5378fde..2d71f0a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,7 @@ libtzplatform_config_@LIBTZPLATFORM_CONFIG_VERSION@_la_SOURCES = \
        $(SRC_FROMWRAPPER_SHARED) \
        $(SRC_FROMTOOL)
 
-tizen-platform.conf: ../tizen-platform.meta
+tizen-platform.conf: /etc/tizen-platform.meta
        tzplatform-tool pretty $< >$@
 
 $(SRC_FROMWRAPPER) tzplatform_get.c:

diff --git a/tizen-platform.meta b/tizen-platform.meta
deleted file mode 100644 (file)
index 465768e..0000000
--- a/tizen-platform.meta
+++ /dev/null
@@ -1,168 +0,0 @@
-############################################################
-#                   SYSTEM VARIABLES                       #
-############################################################
-
-############# Base dirs #############
-
-# Tizen 3 (single user):
-#TZ_SYS_HOME=/home
-#TZ_SYS_ROOT=/opt/usr/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=/opt/usr/home
-TZ_SYS_ROOT=/root
-TZ_SYS_SHARE=/opt/share
-TZ_SYS_RO_SHARE=/usr/share
-TZ_SYS_ETC=/opt/etc
-TZ_SYS_RO_ETC=/etc
-TZ_SYS_DATA=/opt/data
-TZ_SYS_BIN=/usr/bin
-TZ_SYS_SBIN=/usr/sbin
-TZ_SYS_SMACK=/etc/smack
-TZ_SYS_STORAGE=/opt/media
-TZ_SYS_MEDIA=/opt/media
-TZ_SYS_TEMP_MNT=/mnt
-TZ_SYS_SRV=/srv
-TZ_SYS_VAR=/opt/var
-TZ_SYS_USER_GROUP=users
-TZ_SYS_GLOBALAPP_USER=tizenglobalapp
-TZ_SYS_ADMIN_GROUP=system
-TZ_SYS_GLOBALUSER_DATA=/opt/usr/data
-TZ_SYS_GLOBALUSER_DB=/opt/usr/dbspace
-
-# which user to use when applications start request are sent by system daemons
-TZ_SYS_DEFAULT_USER=owner
-
-# The default directory to store coredumps and logdumps when a crash is occurred
-TZ_SYS_CRASH=/opt/share/crash/dump
-
-############# 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_ICONS=/opt/share/icons
-#TZ_SYS_RO_ICONS=/usr/share/icons
-#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
-#TZ_SYS_RW_UG=/opt/ug
-#TZ_SYS_RO_UG=/usr/ug
-
-# Tizen 3 (multi user):
-TZ_SYS_APP_PREINSTALL=/opt/usr/apps/.preinstallWidgets
-TZ_SYS_DB=/opt/dbspace
-TZ_SYS_DEBUG_PORT=9222
-TZ_SYS_CONFIG=/usr/kdb
-TZ_SYS_RW_APP=/opt/usr/apps
-TZ_SYS_RO_APP=/usr/apps
-TZ_SYS_RW_ICONS=/usr/share/icons
-TZ_SYS_RO_ICONS=/usr/share/icons
-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=/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_RW_UG=/usr/ug
-TZ_SYS_RO_UG=/usr/ug
-TZ_SYS_RUN=/var/run
-
-############################################################
-#                   SDK VARIABLES                          #
-############################################################
-
-TZ_SDK_USER_NAME=${TZ_SYS_DEFAULT_USER}
-TZ_SDK_HOME=/home/${TZ_SDK_USER_NAME}
-TZ_SDK_TOOLS=${TZ_SDK_HOME}/apps_rw/tmp/sdk_tools
-
-############################################################
-#                   USER VARIABLES                         #
-############################################################
-
-############# 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_UG=/opt/usr/ug
-
-# Tizen 3 (multi user):
-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
-TZ_USER_UG=$TZ_USER_HOME/ug
-
-############# 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
-
-# Tizen 3 (multi user):
-TZ_USER_APPROOT=$TZ_USER_HOME/.applications
-TZ_USER_DB=$TZ_USER_APPROOT/dbspace
-TZ_USER_PACKAGES=$TZ_USER_APPROOT/manifest
-TZ_USER_DESKTOP=$TZ_USER_APPROOT/desktop
-TZ_USER_ICONS=$TZ_USER_APPROOT/icons
-#TZ_USER_CONFIG=$TZ_USER_HOME/kdb
-TZ_USER_APP=$TZ_USER_HOME/apps_rw
-TZ_USER_CACHE=$TZ_USER_HOME/.cache
-TZ_USER_CONFIG=$TZ_USER_HOME/.config
-
-############# 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_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_MUSIC=$TZ_USER_CONTENT/Music
-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