summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunmin Lee <sunm.lee@samsung.com>2017-09-05 17:22:15 +0900
committerSunmin Lee <sunm.lee@samsung.com>2017-09-05 17:25:59 +0900
commit32a0ac8f19adef3956ba8649031a02c999799317 (patch)
tree00253384519ff0a2495a92509cfa2685ec257dda
parent9003f56a78705ad5cfeb9b1042f9dba6fe214af6 (diff)
downloadca-certificates-tizen-tizen_4.0_tv.tar.gz
ca-certificates-tizen-tizen_4.0_tv.tar.bz2
ca-certificates-tizen-tizen_4.0_tv.zip
RW update script for Tizen 2.4 (to 3.0) is not necessary in Tizen 4.0. Remove this file to avoid being executed during Tizen 4.0 update. Change-Id: I4268f5895025d9f8cd3b679fb05e509eb41ceef7
-rw-r--r--packaging/ca-certificates-tizen.spec11
-rw-r--r--tools/CMakeLists.txt6
-rw-r--r--tools/upgrade/500.ca-certificates-tizen-upgrade.sh.in24
-rwxr-xr-xtools/upgrade/CMakeLists.txt25
4 files changed, 1 insertions, 65 deletions
diff --git a/packaging/ca-certificates-tizen.spec b/packaging/ca-certificates-tizen.spec
index a81b249..93ebb4d 100644
--- a/packaging/ca-certificates-tizen.spec
+++ b/packaging/ca-certificates-tizen.spec
@@ -32,10 +32,6 @@ Requires: %name = %version-%release
%define macro_ca_certificates_tizen %{ro_etc_dir}/rpm/macros.ca-certificates-tizen
-%define upgrade_dir %{ro_data_dir}/upgrade
-%define upgrade_script_dir %{upgrade_dir}/scripts
-%define upgrade_data_dir %{upgrade_dir}/data
-
%prep
%setup -q
cp %{SOURCE1001} .
@@ -61,9 +57,7 @@ cp %{SOURCE1001} .
%cmake . -DRELMODE=%{REL_MODE} \
-DTIZEN_DIR=%{tizen_dir} \
-DFINGERPRINT_DIR=%{fingerprint_dir} \
- -DFINGERPRINT_RW_DIR=%{fingerprint_rw_dir} \
- -DUPGRADE_SCRIPT_DIR=%upgrade_script_dir \
- -DUPGRADE_DATA_DIR=%upgrade_data_dir
+ -DFINGERPRINT_RW_DIR=%{fingerprint_rw_dir}
make %{?_smp_mflags}
@@ -83,8 +77,5 @@ echo "%TZ_SYS_REVOKED_CERTS_FINGERPRINTS_RUNTIME %{fingerprint_rw_dir}/fingerpri
%{fingerprint_dir}/*
%{fingerprint_rw_dir}/fingerprint_list_runtime.xml
-%attr(775, root, root) %{upgrade_script_dir}/500.ca-certificates-tizen-upgrade.sh
-%{upgrade_data_dir}/fingerprint_list_runtime.xml
-
%files devel
%config %{macro_ca_certificates_tizen}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 7ea1e38..d389f23 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -45,9 +45,3 @@ INSTALL(FILES ${FINGERPRINT_LIST_XML} ${FINGERPRINT_LIST_XSD}
INSTALL(FILES ${FINGERPRINT_LIST_RW_XML}
DESTINATION ${FINGERPRINT_RW_DIR}
)
-
-INSTALL(FILES ${FINGERPRINT_LIST_RW_XML}
- DESTINATION ${UPGRADE_DATA_DIR}
-)
-
-ADD_SUBDIRECTORY(upgrade)
diff --git a/tools/upgrade/500.ca-certificates-tizen-upgrade.sh.in b/tools/upgrade/500.ca-certificates-tizen-upgrade.sh.in
deleted file mode 100644
index 2289cdf..0000000
--- a/tools/upgrade/500.ca-certificates-tizen-upgrade.sh.in
+++ /dev/null
@@ -1,24 +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 500.ca-certificates-tizen-upgrade.sh.in
-# @author Sangwan Kwon (sangwan.kwon@samsung.com)
-# @brief fingerprint migration scripts for platform upgrade 2.4 -> 3.0
-#
-
-mkdir -p @FINGERPRINT_RW_DIR@
-cp @UPGRADE_DATA_DIR@/fingerprint_list_runtime.xml @FINGERPRINT_RW_DIR@
diff --git a/tools/upgrade/CMakeLists.txt b/tools/upgrade/CMakeLists.txt
deleted file mode 100755
index 55c2fb6..0000000
--- a/tools/upgrade/CMakeLists.txt
+++ /dev/null
@@ -1,25 +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(
- 500.ca-certificates-tizen-upgrade.sh.in 500.ca-certificates-tizen-upgrade.sh
- @ONLY)
-
-INSTALL(FILES
- 500.ca-certificates-tizen-upgrade.sh
- DESTINATION ${UPGRADE_SCRIPT_DIR})