From 95843aa9b16eead28d181ffe34b067fda75545d9 Mon Sep 17 00:00:00 2001 From: "sangwan.kwon" Date: Fri, 30 Jun 2017 17:10:23 +0900 Subject: [PATCH] Fix upgrade script number * Accordig to OS upgrade team's guide, these scripts would be run as 242, 243. Change-Id: Ibd03157c1ec345cb6791678d8bbc8824a1fe7863 Signed-off-by: sangwan.kwon (cherry picked from commit b911af767ffe491120bf326be57bfa098e490d03) --- ...rt-svc-db-upgrade.sh.in => 242.cert-svc-db-upgrade.sh.in} | 4 ++-- ...grade.sh.in => 243.cert-svc-disabled-certs-upgrade.sh.in} | 2 +- etc/upgrade/CMakeLists.txt | 12 ++++++------ packaging/cert-svc.spec | 4 ++-- tests/upgrade/cert-svc-test-upgrade.sh.in | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) rename etc/upgrade/{202.cert-svc-db-upgrade.sh.in => 242.cert-svc-db-upgrade.sh.in} (95%) rename etc/upgrade/{203.cert-svc-disabled-certs-upgrade.sh.in => 243.cert-svc-disabled-certs-upgrade.sh.in} (97%) diff --git a/etc/upgrade/202.cert-svc-db-upgrade.sh.in b/etc/upgrade/242.cert-svc-db-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 --- a/etc/upgrade/202.cert-svc-db-upgrade.sh.in +++ b/etc/upgrade/242.cert-svc-db-upgrade.sh.in @@ -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 diff --git a/etc/upgrade/203.cert-svc-disabled-certs-upgrade.sh.in b/etc/upgrade/243.cert-svc-disabled-certs-upgrade.sh.in similarity index 97% rename from etc/upgrade/203.cert-svc-disabled-certs-upgrade.sh.in rename to etc/upgrade/243.cert-svc-disabled-certs-upgrade.sh.in index f79dd14..fa8376f 100755 --- a/etc/upgrade/203.cert-svc-disabled-certs-upgrade.sh.in +++ b/etc/upgrade/243.cert-svc-disabled-certs-upgrade.sh.in @@ -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 # diff --git a/etc/upgrade/CMakeLists.txt b/etc/upgrade/CMakeLists.txt index 74096a4..3980b62 100644 --- a/etc/upgrade/CMakeLists.txt +++ b/etc/upgrade/CMakeLists.txt @@ -17,14 +17,14 @@ # 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} ) diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec index 33c0c1d..b8de032 100644 --- a/packaging/cert-svc.spec +++ b/packaging/cert-svc.spec @@ -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 diff --git a/tests/upgrade/cert-svc-test-upgrade.sh.in b/tests/upgrade/cert-svc-test-upgrade.sh.in index d301007..a3966aa 100755 --- a/tests/upgrade/cert-svc-test-upgrade.sh.in +++ b/tests/upgrade/cert-svc-test-upgrade.sh.in @@ -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;"` -- 2.7.4