Apply update path config

The new platform config path TZ_SYS_UPGRADE is introduced.
Apply it to each file.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f291c00..4559f6b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(rw-updater C)
 
+CONFIGURE_FILE(upgrade/install-sdb-rule.sh.in  upgrade/install-sdb-rule.sh  @ONLY)
+CONFIGURE_FILE(upgrade/update-init.sh.in       upgrade/update-init.sh       @ONLY)
+CONFIGURE_FILE(upgrade/update.sh.in            upgrade/update.sh            @ONLY)
+CONFIGURE_FILE(upgrade/record-version.sh.in    upgrade/record-version.sh    @ONLY)
+CONFIGURE_FILE(units/udev-sdb-init.service.in  units/udev-sdb-init.service  @ONLY)
+CONFIGURE_FILE(units/offline-update.service.in units/offline-update.service @ONLY)
+
 #add sub directory
 ADD_SUBDIRECTORY(rw-update-ani)
 ADD_SUBDIRECTORY(rstsmack)

diff --git a/packaging/system-rw-update.spec b/packaging/system-rw-update.spec
index f9f70b7..7145b3f 100644 (file)
--- a/packaging/system-rw-update.spec
+++ b/packaging/system-rw-update.spec
@@ -1,6 +1,6 @@
 Name:       system-rw-update
 Summary:    System RW update management
-Version:    1.2.1
+Version:    1.2.2
 Release:    0
 Group:      Base/Startup
 License:    Apache-2.0
@@ -9,6 +9,7 @@ Source1001: %{name}.manifest
 Source1002: %{name}-ani.manifest
 
 BuildRequires: cmake
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 This package provides files for RW update
@@ -36,14 +37,24 @@ cp %{SOURCE1001} .
 cp %{SOURCE1002} .
 
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+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
 %__make %{?_smp_mflags}
 
 %install
 %make_install
 
-mkdir -p %{buildroot}%{_datadir}
-cp -r upgrade %{buildroot}%{_datadir}
+%define upgrade_dir %TZ_SYS_UPGRADE
+mkdir -p %{buildroot}%{upgrade_dir}
+cp upgrade/99-sdb-switch.rules %{buildroot}%{upgrade_dir}
+cp upgrade/install-sdb-rule.sh %{buildroot}%{upgrade_dir}
+cp upgrade/record-version.sh %{buildroot}%{upgrade_dir}
+cp upgrade/rw-update-macro.inc %{buildroot}%{upgrade_dir}
+cp upgrade/update-init.sh %{buildroot}%{upgrade_dir}
+cp upgrade/update.sh %{buildroot}%{upgrade_dir}
 mkdir -p %{buildroot}%{_unitdir}/system-update.target.wants
 install -m 644 units/offline-update.service %{buildroot}%{_unitdir}
 ln -s ../offline-update.service %{buildroot}%{_unitdir}/system-update.target.wants/offline-update.service
@@ -65,7 +76,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 /opt/data/update/99-sdb-switch.rules %{_libdir}/udev/rules.d
+       ln -s %TZ_SYS_UPGRADE_DATA/99-sdb-switch.rules %{_libdir}/udev/rules.d
 fi
 if [ ! -e %{_bindir}/rstsmack ]; then
        ln -s %{_bindir}/rstsmack-for-update %{_bindir}/rstsmack
@@ -74,7 +85,7 @@ fi
 %files
 %manifest %{name}.manifest
 %license LICENSE.Apache-2.0
-%{_datadir}/upgrade/*
+%TZ_SYS_UPGRADE/*
 %{_unitdir}/offline-update.service
 %{_unitdir}/system-update.target.wants
 %{_unitdir}/udev-sdb-init.service

diff --git a/units/offline-update.service b/units/offline-update.service.in
similarity index 80%
rename from units/offline-update.service
rename to units/offline-update.service.in
index cb81600..5fb87e2 100644 (file)
--- a/units/offline-update.service
+++ b/units/offline-update.service.in
@@ -7,4 +7,4 @@ After=sysinit.target
 [Service]
 Type=oneshot
 SmackProcessLabel=System::Privileged
-ExecStart=/usr/share/upgrade/update-init.sh
+ExecStart=@TZ_SYS_UPGRADE@/update-init.sh

diff --git a/units/udev-sdb-init.service b/units/udev-sdb-init.service.in
similarity index 76%
rename from units/udev-sdb-init.service
rename to units/udev-sdb-init.service.in
index 893a1fb..812610f 100644 (file)
--- a/units/udev-sdb-init.service
+++ b/units/udev-sdb-init.service.in
@@ -6,4 +6,4 @@ Before=sysinit.target systemd-udevd.service
 [Service]
 SmackProcessLabel=System
 Type=oneshot
-ExecStart=/usr/share/upgrade/install-sdb-rule.sh
+ExecStart=@TZ_SYS_UPGRADE@/install-sdb-rule.sh

diff --git a/upgrade/install-sdb-rule.sh b/upgrade/install-sdb-rule.sh.in
similarity index 59%
rename from upgrade/install-sdb-rule.sh
rename to upgrade/install-sdb-rule.sh.in
index 6bff17c..4adfaae 100755 (executable)
--- a/upgrade/install-sdb-rule.sh
+++ b/upgrade/install-sdb-rule.sh.in
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 SDB_RULE="99-sdb-switch.rules"
-DEST=/opt/data/update
+DEST=@TZ_SYS_UPGRADE_DATA@
 
 if [ ! -e ${DEST}/${SDB_RULE} ]; then
        /bin/mkdir -p ${DEST}
-       /bin/cp /usr/share/upgrade/${SDB_RULE} ${DEST}
+       /bin/cp @TZ_SYS_UPGRADE@/${SDB_RULE} ${DEST}
 fi

diff --git a/upgrade/record-version.sh b/upgrade/record-version.sh.in
similarity index 63%
rename from upgrade/record-version.sh
rename to upgrade/record-version.sh.in
index 9f74a06..4ce57d2 100755 (executable)
--- a/upgrade/record-version.sh
+++ b/upgrade/record-version.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-RW_MACRO=/usr/share/upgrade/rw-update-macro.inc
+RW_MACRO=@TZ_SYS_UPGRADE@/rw-update-macro.inc
 
 if [ -e ${RW_MACRO} ]; then
        source ${RW_MACRO}

diff --git a/upgrade/update-init.sh b/upgrade/update-init.sh.in
similarity index 84%
rename from upgrade/update-init.sh
rename to upgrade/update-init.sh.in
index c57f52f..db05a1b 100755 (executable)
--- a/upgrade/update-init.sh
+++ b/upgrade/update-init.sh.in
@@ -3,8 +3,8 @@
 # RW update initialize script
 #
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-RW_MACRO=/usr/share/upgrade/rw-update-macro.inc
-RW_UPDATE=/usr/share/upgrade/update.sh
+RW_MACRO=@TZ_SYS_UPGRADE@/rw-update-macro.inc
+RW_UPDATE=@TZ_SYS_UPGRADE@/update.sh
 DEBUG_MODE=/opt/usr/.upgdebug
 
 if [ -f $RW_MACRO ]; then

diff --git a/upgrade/update.sh b/upgrade/update.sh.in
similarity index 88%
rename from upgrade/update.sh
rename to upgrade/update.sh.in
index 8ead592..999a71b 100755 (executable)
--- a/upgrade/update.sh
+++ b/upgrade/update.sh.in
@@ -7,13 +7,14 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 UPI_RW_UPDATE_ERROR=fa1a
 
 TMP_DIR=/tmp/upgrade
-PATCH_DIR=/usr/share/upgrade/scripts
-UPDATE_DIR=/opt/data/update
-LOG_FILE=${UPDATE_DIR}/rw_update.log
-RESULT_FILE=${UPDATE_DIR}/result
-SDB_RULE=${UPDATE_DIR}/99-sdb-switch.rules
+UPDATE_DIR=@TZ_SYS_UPGRADE@
+PATCH_DIR=@TZ_SYS_UPGRADE_SCRIPTS@
+UPDATE_DATA_DIR=@TZ_SYS_UPGRADE_DATA@
+LOG_FILE=${UPDATE_DATA_DIR}/rw_update.log
+RESULT_FILE=${UPDATE_DATA_DIR}/result
+SDB_RULE=${UPDATE_DATA_DIR}/99-sdb-switch.rules
 VERSION_FILE=/opt/etc/version
-RW_MACRO=/usr/share/upgrade/rw-update-macro.inc
+RW_MACRO=${UPDATE_DIR}/rw-update-macro.inc
 RUN=/bin/sh
 
 RW_GUI=
@@ -33,7 +34,7 @@ Verity_Check() {
        fi
 
        SC_FILE=`/usr/bin/basename $1`
-       SC_LIST=/usr/share/upgrade/rw-script.list
+       SC_LIST=${UPDATE_DIR}/rw-script.list
        if [ -f ${SC_LIST} ]; then
                grep ${SC_FILE} ${SC_LIST} > /dev/null 2>&1
                if [ "$?" = "0" ]; then