Revert TZ_SYS_UPGRADE_DATA

Change-Id: Ic5198e24f2922abbd69a421158aeb2bec74d592a
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/packaging/system-rw-update.spec b/packaging/system-rw-update.spec
index 45b9a1a..0a7a980 100644 (file)
--- a/packaging/system-rw-update.spec
+++ b/packaging/system-rw-update.spec
@@ -40,8 +40,7 @@ export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
 LDFLAGS="$LDFLAGS"
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTZ_SYS_UPGRADE=%TZ_SYS_UPGRADE \
-       -DTZ_SYS_UPGRADE_SCRIPTS=%TZ_SYS_UPGRADE_SCRIPTS \
-       -DTZ_SYS_UPGRADE_DATA=%TZ_SYS_UPGRADE_DATA
+       -DTZ_SYS_UPGRADE_SCRIPTS=%TZ_SYS_UPGRADE_SCRIPTS
 %__make %{?_smp_mflags}
 
 %install
@@ -76,7 +75,7 @@ if [ -e %{_libdir}/udev/rules.d/99-sdb-switch.rules ]; then
        echo "Exist 99-sdb-switch.rules, Skip!"
 else
        mkdir -p %{_libdir}/udev/rules.d
-       ln -s %TZ_SYS_UPGRADE_DATA/99-sdb-switch.rules %{_libdir}/udev/rules.d
+       ln -s /opt/data/update/99-sdb-switch.rules %{_libdir}/udev/rules.d
 fi
 if [ ! -e %{_bindir}/rstsmack ]; then
        ln -s %{_bindir}/rstsmack-for-update %{_bindir}/rstsmack

diff --git a/upgrade/install-sdb-rule.sh.in b/upgrade/install-sdb-rule.sh.in
index 6b0e067..186d409 100755 (executable)
--- a/upgrade/install-sdb-rule.sh.in
+++ b/upgrade/install-sdb-rule.sh.in
@@ -3,7 +3,7 @@
 PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 
 SDB_RULE="99-sdb-switch.rules"
-DEST=@TZ_SYS_UPGRADE_DATA@
+DEST=/opt/data/update
 
 if [ ! -e ${DEST}/${SDB_RULE} ]; then
        /bin/mkdir -p ${DEST}

diff --git a/upgrade/update.sh.in b/upgrade/update.sh.in
index 999a71b..ef11319 100755 (executable)
--- a/upgrade/update.sh.in
+++ b/upgrade/update.sh.in
@@ -9,7 +9,7 @@ UPI_RW_UPDATE_ERROR=fa1a
 TMP_DIR=/tmp/upgrade
 UPDATE_DIR=@TZ_SYS_UPGRADE@
 PATCH_DIR=@TZ_SYS_UPGRADE_SCRIPTS@
-UPDATE_DATA_DIR=@TZ_SYS_UPGRADE_DATA@
+UPDATE_DATA_DIR=/opt/data/update
 LOG_FILE=${UPDATE_DATA_DIR}/rw_update.log
 RESULT_FILE=${UPDATE_DATA_DIR}/result
 SDB_RULE=${UPDATE_DATA_DIR}/99-sdb-switch.rules