Fix upgrade script number

* Accordig to OS upgrade team's guide, these scripts would be run as 241, 242.

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

diff --git a/packaging/ca-certificates.spec b/packaging/ca-certificates.spec
index 54c18e43a2969b1945844fc3e5af39e79f7c1935..5d69fbc67028cc5ce131d12ac33d0f414f751768 100644 (file)
--- a/packaging/ca-certificates.spec
+++ b/packaging/ca-certificates.spec
@@ -129,8 +129,8 @@ cp %{buildroot}%{ca_bundle} %{buildroot}%{upgrade_data_dir}
 # symbol CA bundle
 %{ro_ca_bundle}
 # support for platform upgrade (Tizen 2.4 -> 3.0)
-%attr(755, root, root) %{upgrade_script_dir}/200.ca-certificates-certs-upgrade.sh
-%attr(755, root, root) %{upgrade_script_dir}/201.ca-certificates-bundle-upgrade.sh
+%attr(755, root, root) %{upgrade_script_dir}/240.ca-certificates-certs-upgrade.sh
+%attr(755, root, root) %{upgrade_script_dir}/241.ca-certificates-bundle-upgrade.sh
 %attr(664, root, %{group_name}) %{upgrade_data_dir}/ca-bundle.pem
 
 %files devel

diff --git a/scripts/200.ca-certificates-certs-upgrade.sh.in b/scripts/200.ca-certificates-certs-upgrade.sh.in
deleted file mode 100644 (file)
index 6059e65..0000000
--- a/scripts/200.ca-certificates-certs-upgrade.sh.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-# @file        200.ca-certificates-certs-upgrade.sh.in
-# @author      Sangwan Kwon (sangwan.kwon@samsung.com)
-# @brief       Certificates migration scripts for platform upgrade 2.4 -> 3.0
-#
-
-# delete old certificates
-rm -rf @TZ_SYS_CA_CERTS@
-mkdir -p @TZ_SYS_CA_CERTS@
-
-# make link files : for new certificates in RW area
-ln -sf @TZ_SYS_RO_CA_CERTS_ORIG@/* @TZ_SYS_CA_CERTS@/
-
-# change smack rule
-chsmack -a @SMACK_DOMAIN_NAME@ @TZ_SYS_CA_CERTS@
-
-# change DAC
-chown -h -R @USER_NAME@:@GROUP_NAME@ @TZ_SYS_CA_CERTS@
-
-# change mode
-chmod 775 @TZ_SYS_CA_CERTS@

diff --git a/scripts/201.ca-certificates-bundle-upgrade.sh.in b/scripts/201.ca-certificates-bundle-upgrade.sh.in
deleted file mode 100644 (file)
index edb2db2..0000000
--- a/scripts/201.ca-certificates-bundle-upgrade.sh.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-# @file        201.ca-certificates-bundle-upgrade.sh.in
-# @author      Sangwan Kwon (sangwan.kwon@samsung.com)
-# @brief       CA bundle migration scripts for platform upgrade 2.4 -> 3.0
-#
-
-# delete old ca bundle
-rm -rf @OLD_CA_BUNDLE_DIR@
-
-# upgrade bundle file
-mkdir -p @TZ_SYS_CA_BUNDLE_DIR@
-cp @UPGRADE_DATA_DIR@/ca-bundle.pem @TZ_SYS_CA_BUNDLE_DIR@
-
-# change permission
-chsmack -a @SMACK_DOMAIN_NAME@ @TZ_SYS_CA_BUNDLE@
-chown root:@GROUP_NAME@ @TZ_SYS_CA_BUNDLE@
-chmod 664 @TZ_SYS_CA_BUNDLE@

diff --git a/scripts/240.ca-certificates-certs-upgrade.sh.in b/scripts/240.ca-certificates-certs-upgrade.sh.in
new file mode 100644 (file)
index 0000000..de62785
--- /dev/null
+++ b/scripts/240.ca-certificates-certs-upgrade.sh.in
@@ -0,0 +1,37 @@
+#!/bin/bash
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+# @file        240.ca-certificates-certs-upgrade.sh.in
+# @author      Sangwan Kwon (sangwan.kwon@samsung.com)
+# @brief       Certificates migration scripts for platform upgrade 2.4 -> 3.0
+#
+
+# delete old certificates
+rm -rf @TZ_SYS_CA_CERTS@
+mkdir -p @TZ_SYS_CA_CERTS@
+
+# make link files : for new certificates in RW area
+ln -sf @TZ_SYS_RO_CA_CERTS_ORIG@/* @TZ_SYS_CA_CERTS@/
+
+# change smack rule
+chsmack -a @SMACK_DOMAIN_NAME@ @TZ_SYS_CA_CERTS@
+
+# change DAC
+chown -h -R @USER_NAME@:@GROUP_NAME@ @TZ_SYS_CA_CERTS@
+
+# change mode
+chmod 775 @TZ_SYS_CA_CERTS@

diff --git a/scripts/241.ca-certificates-bundle-upgrade.sh.in b/scripts/241.ca-certificates-bundle-upgrade.sh.in
new file mode 100644 (file)
index 0000000..80d20af
--- /dev/null
+++ b/scripts/241.ca-certificates-bundle-upgrade.sh.in
@@ -0,0 +1,33 @@
+#!/bin/bash
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+# @file        241.ca-certificates-bundle-upgrade.sh.in
+# @author      Sangwan Kwon (sangwan.kwon@samsung.com)
+# @brief       CA bundle migration scripts for platform upgrade 2.4 -> 3.0
+#
+
+# delete old ca bundle
+rm -rf @OLD_CA_BUNDLE_DIR@
+
+# upgrade bundle file
+mkdir -p @TZ_SYS_CA_BUNDLE_DIR@
+cp @UPGRADE_DATA_DIR@/ca-bundle.pem @TZ_SYS_CA_BUNDLE_DIR@
+
+# change permission
+chsmack -a @SMACK_DOMAIN_NAME@ @TZ_SYS_CA_BUNDLE@
+chown root:@GROUP_NAME@ @TZ_SYS_CA_BUNDLE@
+chmod 664 @TZ_SYS_CA_BUNDLE@

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 4b88fd2942c93b75f0e2a7ba914bf552bab913a9..2e760ac3cc2cb27905840d4dfd481ad3f8e3e4f3 100755 (executable)
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -17,15 +17,15 @@
 #
 
 CONFIGURE_FILE(
-       200.ca-certificates-certs-upgrade.sh.in
-       200.ca-certificates-certs-upgrade.sh
+       240.ca-certificates-certs-upgrade.sh.in
+       240.ca-certificates-certs-upgrade.sh
        @ONLY)
 CONFIGURE_FILE(
-       201.ca-certificates-bundle-upgrade.sh.in
-       201.ca-certificates-bundle-upgrade.sh
+       241.ca-certificates-bundle-upgrade.sh.in
+       241.ca-certificates-bundle-upgrade.sh
        @ONLY)
 
 INSTALL(FILES
-       200.ca-certificates-certs-upgrade.sh
-       201.ca-certificates-bundle-upgrade.sh
+       240.ca-certificates-certs-upgrade.sh
+       241.ca-certificates-bundle-upgrade.sh
        DESTINATION ${UPGRADE_SCRIPT_DIR})