From bb1d90909f7185b436204a1fde5da99a902788c1 Mon Sep 17 00:00:00 2001 From: "sangwan.kwon" Date: Thu, 17 Aug 2017 05:13:57 -0400 Subject: Remove deprecated upgrade script Change-Id: I8907a60bb513edd1021b510c37be64f6d37c3caf Signed-off-by: sangwan.kwon --- CMakeLists.txt | 1 - packaging/libwebappenc.spec | 8 -------- resources/CMakeLists.txt | 8 -------- scripts/240.wae.sh.in | 30 ------------------------------ scripts/CMakeLists.txt | 16 ---------------- 5 files changed, 63 deletions(-) delete mode 100755 scripts/240.wae.sh.in delete mode 100644 scripts/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 96efdbe..436eb74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,4 +93,3 @@ ADD_SUBDIRECTORY(resources) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(systemd) -ADD_SUBDIRECTORY(scripts) diff --git a/packaging/libwebappenc.spec b/packaging/libwebappenc.spec index 94dd937..8db7728 100644 --- a/packaging/libwebappenc.spec +++ b/packaging/libwebappenc.spec @@ -42,9 +42,6 @@ Web application encryption and decryption service (test) %define smack_domain System %define bin_dir %TZ_SYS_BIN %define rw_share_dir %TZ_SYS_SHARE -%define upgrade_dir %TZ_SYS_RO_SHARE/upgrade -%define upgrade_script_dir %{upgrade_dir}/scripts -%define upgrade_data_dir %{upgrade_dir}/data %prep %setup -q @@ -58,8 +55,6 @@ Web application encryption and decryption service (test) -DSYSTEMD_UNIT_DIR=%{_unitdir} \ -DCMAKE_BUILD_TYPE=%{build_type} \ -DRW_SHARE_DIR=%rw_share_dir \ - -DUPGRADE_DATA_DIR=%upgrade_data_dir \ - -DUPGRADE_SCRIPT_DIR=%upgrade_script_dir \ -DUSER_NAME=%user_name \ -DGROUP_NAME=%group_name \ -DSMACK_DOMAIN=%smack_domain \ @@ -103,9 +98,6 @@ fi %dir %attr(770, %user_name, %group_name) %{rw_share_dir}/wae/app_dek %attr(660, %user_name, %group_name) %{rw_share_dir}/wae/app_dek/* -%attr(775,root,root) %{upgrade_script_dir}/240.wae.sh -%{upgrade_data_dir}/wae/app_dek/* - %files devel %{_includedir}/* %{_libdir}/pkgconfig/%{name}.pc diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 030553c..ffc566e 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -23,11 +23,3 @@ INSTALL(FILES PERMISSIONS OWNER_READ OWNER_WRITE ) - -INSTALL(FILES - WAE_APPDEK_KEK_PublicKey.pem - WAE_APPDEK_KEK_PrivateKey.pem - DESTINATION ${UPGRADE_DATA_DIR}/wae/app_dek - PERMISSIONS OWNER_READ - OWNER_WRITE -) diff --git a/scripts/240.wae.sh.in b/scripts/240.wae.sh.in deleted file mode 100755 index 68f99f9..0000000 --- a/scripts/240.wae.sh.in +++ /dev/null @@ -1,30 +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.wae.sh.in -# @author Kyungwook Tak (k.tak@samsung.com) -# @brief Platform upgrade support - -WAE_DIR=@RW_SHARE_DIR@/wae - -cp -rf @UPGRADE_DATA_DIR@/wae $WAE_DIR - -chsmack -a "@SMACK_DOMAIN@" $WAE_DIR -r -chown -R @USER_NAME@:@GROUP_NAME@ $WAE_DIR -chmod 770 $WAE_DIR -chmod 770 $WAE_DIR/app_dek -chmod 660 $WAE_DIR/app_dek/* diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt deleted file mode 100644 index 0920103..0000000 --- a/scripts/CMakeLists.txt +++ /dev/null @@ -1,16 +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. -# -CONFIGURE_FILE(240.wae.sh.in 240.wae.sh @ONLY) -INSTALL(FILES 240.wae.sh DESTINATION ${UPGRADE_SCRIPT_DIR}) -- cgit v1.2.3