Fix upgrade script number 25/136725/1 accepted/tizen/4.0/unified/20170816.013850 accepted/tizen/4.0/unified/20170816.020239 accepted/tizen/4.0/unified/20170829.020442 accepted/tizen/unified/20170705.163014 submit/tizen/20170704.073704 submit/tizen/20170705.025248 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0/20170828.100004 submit/tizen_4.0/20170828.110004 submit/tizen_4.0_unified/20170814.115522
authorsangwan.kwon <sangwan.kwon@samsung.com>
Fri, 30 Jun 2017 08:10:23 +0000 (17:10 +0900)
committersangwan kwon <sangwan.kwon@samsung.com>
Mon, 3 Jul 2017 04:54:29 +0000 (04:54 +0000)
* Accordig to OS upgrade team's guide, these scripts would be run as 242, 243.

Change-Id: Ibd03157c1ec345cb6791678d8bbc8824a1fe7863
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
(cherry picked from commit b911af767ffe491120bf326be57bfa098e490d03)

etc/upgrade/242.cert-svc-db-upgrade.sh.in [moved from etc/upgrade/202.cert-svc-db-upgrade.sh.in with 95% similarity]
etc/upgrade/243.cert-svc-disabled-certs-upgrade.sh.in [moved from etc/upgrade/203.cert-svc-disabled-certs-upgrade.sh.in with 97% similarity]
etc/upgrade/CMakeLists.txt
packaging/cert-svc.spec
tests/upgrade/cert-svc-test-upgrade.sh.in

similarity index 95%
rename from etc/upgrade/202.cert-svc-db-upgrade.sh.in
rename to etc/upgrade/242.cert-svc-db-upgrade.sh.in
index 0644383..2c23b6d 100755 (executable)
@@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-# @file        202.cert-svc-db-upgrade.sh.in
+# @file        242.cert-svc-db-upgrade.sh.in
 # @author      Sangwan Kwon (sangwan.kwon@samsung.com)
 # @brief       cert-svc db migration scripts for platform upgrade 2.4 -> 3.0
 #
@@ -53,7 +53,7 @@ sqlite3 $NEW_DB "UPDATE schema_info SET version='1', description='Tizen 2.4' \
 disabled_certs_cnt=`sqlite3 $OLD_DB "SELECT count(*) FROM disabled_certs;"`
 if [ "$disabled_certs_cnt" != "0" ]
 then
-       @UPGRADE_SCRIPT_PATH@/cert-svc-disabled-certs-upgrade.sh $OLD_DB $NEW_DB
+       @UPGRADE_SCRIPT_PATH@/243.cert-svc-disabled-certs-upgrade.sh $OLD_DB $NEW_DB
 fi
 
 rm -rf $OLD_DB
@@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-# @file        203.cert-svc-disabled-certs-upgrade.sh.in
+# @file        243.cert-svc-disabled-certs-upgrade.sh.in
 # @author      Sangwan Kwon (sangwan.kwon@samsung.com)
 # @brief       cert-svc disabled certs upgrade for platform upgrade 2.4 -> 3.0
 #
index 74096a4..3980b62 100644 (file)
 #
 
 CONFIGURE_FILE(
-       202.cert-svc-db-upgrade.sh.in
-       202.cert-svc-db-upgrade.sh @ONLY)
+       242.cert-svc-db-upgrade.sh.in
+       242.cert-svc-db-upgrade.sh @ONLY)
 CONFIGURE_FILE(
-       203.cert-svc-disabled-certs-upgrade.sh.in
-       203.cert-svc-disabled-certs-upgrade.sh @ONLY)
+       243.cert-svc-disabled-certs-upgrade.sh.in
+       243.cert-svc-disabled-certs-upgrade.sh @ONLY)
 
 INSTALL(FILES
-       202.cert-svc-db-upgrade.sh
-       203.cert-svc-disabled-certs-upgrade.sh
+       242.cert-svc-db-upgrade.sh
+       243.cert-svc-disabled-certs-upgrade.sh
        DESTINATION ${UPGRADE_SCRIPT_PATH}
 )
index 33c0c1d..b8de032 100644 (file)
@@ -179,8 +179,8 @@ fi
 %attr(-, %{user_name}, %{group_name}) %cert_svc_db_path/certs-meta.db-journal
 %attr(-, %{user_name}, %{group_name}) %cert_svc_ro_path
 
-%attr(755, root, root) %upgrade_script_path/202.cert-svc-db-upgrade.sh
-%attr(755, root, root) %upgrade_script_path/203.cert-svc-disabled-certs-upgrade.sh
+%attr(755, root, root) %upgrade_script_path/242.cert-svc-db-upgrade.sh
+%attr(755, root, root) %upgrade_script_path/243.cert-svc-disabled-certs-upgrade.sh
 %upgrade_data_path/certs-meta.db
 
 %files devel
index d301007..a3966aa 100755 (executable)
@@ -32,7 +32,7 @@ before_upgrade_certs_cnt=`ls -l @TZ_SYS_CA_CERTS@ | grep ^l | wc -l`
 before_upgrade_bundle_line=`cat @TZ_SYS_CA_BUNDLE@ | wc -l`
 
 # run db upgrade
-@UPGRADE_SCRIPT_PATH@/cert-svc-db-upgrade.sh
+@UPGRADE_SCRIPT_PATH@/242.cert-svc-db-upgrade.sh
 
 # testcase 1. disabled_certs table should have 2 column
 disabled_certs_cnt=`sqlite3 $NEW_DB "SELECT count(*) FROM disabled_certs;"`