From ffc66dae6f09b07930df26d16ab34dd471d5297f Mon Sep 17 00:00:00 2001 From: Sunmin Lee Date: Tue, 5 Sep 2017 16:42:50 +0900 Subject: [PATCH] Remove old update script RW update script for Tizen 2.4 (to 3.0) is not necessary. There is no big change between 3.0 and 4.0. So no migration script is required. Change-Id: I8febbb73df31c31bb7ee1662224ab8fb0eb03b6b (cherry picked from commit a2f804cb30d7c50457d94ab7c0d4c3aaf64d05aa) --- CMakeLists.txt | 2 -- packaging/ca-certificates.spec | 17 +---------- scripts/240.ca-certificates-certs-upgrade.sh.in | 37 ------------------------ scripts/241.ca-certificates-bundle-upgrade.sh.in | 33 --------------------- scripts/CMakeLists.txt | 31 -------------------- 5 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 scripts/240.ca-certificates-certs-upgrade.sh.in delete mode 100644 scripts/241.ca-certificates-bundle-upgrade.sh.in delete mode 100755 scripts/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index a526e9f..0357650 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,5 +22,3 @@ INSTALL(FILES ) CONFIGURE_FILE(packaging/ca-certificates.manifest.in ca-certificates.manifest @ONLY) - -ADD_SUBDIRECTORY(scripts) diff --git a/packaging/ca-certificates.spec b/packaging/ca-certificates.spec index 5d69fbc..71ce503 100644 --- a/packaging/ca-certificates.spec +++ b/packaging/ca-certificates.spec @@ -53,11 +53,6 @@ for ca-bundle and ssl certs directory # define system macro %define macro_ca_certificates %{ro_etc_dir}/rpm/macros.ca-certificates -# upgrade macro -%define upgrade_dir %{ro_data_dir}/upgrade -%define upgrade_script_dir %{upgrade_dir}/scripts -%define upgrade_data_dir %{upgrade_dir}/data - %prep %setup -q @@ -71,9 +66,7 @@ for ca-bundle and ssl certs directory -DTZ_SYS_RO_CA_BUNDLE=%ro_ca_bundle \ -DTZ_SYS_CA_BUNDLE_DIR=%ca_bundle_dir \ -DTZ_SYS_RO_CA_CERTS_ORIG=%ro_ca_certs_orig_dir \ - -DOLD_CA_BUNDLE_DIR=%old_ca_bundle_dir \ - -DUPGRADE_SCRIPT_DIR=%upgrade_script_dir \ - -DUPGRADE_DATA_DIR=%upgrade_data_dir + -DOLD_CA_BUNDLE_DIR=%old_ca_bundle_dir %install @@ -108,10 +101,6 @@ mkdir -p %{buildroot}%{ca_bundle_dir} # link file : for bundle ln -sf %{ca_bundle} %{buildroot}%{ro_ca_bundle} -# data for platform upgrade (Tizen 2.4 -> 3.0) -mkdir -p %{buildroot}%{upgrade_data_dir} -cp %{buildroot}%{ca_bundle} %{buildroot}%{upgrade_data_dir} - %files %manifest %{name}.manifest %license LICENSE @@ -128,10 +117,6 @@ cp %{buildroot}%{ca_bundle} %{buildroot}%{upgrade_data_dir} %attr(664, root, %{group_name}) %{ca_bundle} # symbol CA bundle %{ro_ca_bundle} -# support for platform upgrade (Tizen 2.4 -> 3.0) -%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 %config %{macro_ca_certificates} diff --git a/scripts/240.ca-certificates-certs-upgrade.sh.in b/scripts/240.ca-certificates-certs-upgrade.sh.in deleted file mode 100644 index de62785..0000000 --- a/scripts/240.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 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 deleted file mode 100644 index 80d20af..0000000 --- a/scripts/241.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 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 deleted file mode 100755 index 2e760ac..0000000 --- a/scripts/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# 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 CMakeLists.txt -# @author Sangwan Kwon (sangwan.kwon@samsung.com) -# - -CONFIGURE_FILE( - 240.ca-certificates-certs-upgrade.sh.in - 240.ca-certificates-certs-upgrade.sh - @ONLY) -CONFIGURE_FILE( - 241.ca-certificates-bundle-upgrade.sh.in - 241.ca-certificates-bundle-upgrade.sh - @ONLY) - -INSTALL(FILES - 240.ca-certificates-certs-upgrade.sh - 241.ca-certificates-bundle-upgrade.sh - DESTINATION ${UPGRADE_SCRIPT_DIR}) -- 2.7.4