diff options
| author | Kyungwook Tak <k.tak@samsung.com> | 2016-08-25 15:48:09 +0900 |
|---|---|---|
| committer | Kyungwook Tak <k.tak@samsung.com> | 2016-08-25 15:48:09 +0900 |
| commit | 5a30249a947b1bb52d31a5dd12e913afc9e90970 (patch) | |
| tree | ef3b85fe46cd334233b920f2d19aa8fa1c348616 | |
| parent | 1e12ee5d832de6fe0b6d795989edf15243fdfe93 (diff) | |
| download | key-manager-5a30249a947b1bb52d31a5dd12e913afc9e90970.tar.gz key-manager-5a30249a947b1bb52d31a5dd12e913afc9e90970.tar.bz2 key-manager-5a30249a947b1bb52d31a5dd12e913afc9e90970.zip | |
Move upgrade patchs to platform upgrade script dirsubmit/tizen/20160829.005907accepted/tizen/wearable/20160830.060753accepted/tizen/tv/20160830.060729accepted/tizen/mobile/20160830.060702accepted/tizen/ivi/20160830.060821accepted/tizen/common/20160829.135729
Platform upgrade script dir: /usr/share/upgrade/scripts
Change-Id: Ia705efe39ce537f42899761b5f2f2b08e3a52e05
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
| -rwxr-xr-x | data/scripts/230.key-manager-change-data-dir.patch.sh.in | 3 | ||||
| -rw-r--r-- | data/scripts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/key-manager.spec | 14 |
3 files changed, 13 insertions, 6 deletions
diff --git a/data/scripts/230.key-manager-change-data-dir.patch.sh.in b/data/scripts/230.key-manager-change-data-dir.patch.sh.in index 7e39e204..fef9c62d 100755 --- a/data/scripts/230.key-manager-change-data-dir.patch.sh.in +++ b/data/scripts/230.key-manager-change-data-dir.patch.sh.in @@ -23,5 +23,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin # move data from old path to new one if [ -d "@OLD_RW_DATA_DIR@" ] && [ "@RW_DATA_DIR@" != "@OLD_RW_DATA_DIR@" ] then + mkdir -p @RW_DATA_DIR@ + chmod 770 @RW_DATA_DIR@ + cp -a @OLD_RW_DATA_DIR@/. @RW_DATA_DIR@ && rm -rf @OLD_RW_DATA_DIR@ fi diff --git a/data/scripts/CMakeLists.txt b/data/scripts/CMakeLists.txt index 57316f2b..5c07257d 100644 --- a/data/scripts/CMakeLists.txt +++ b/data/scripts/CMakeLists.txt @@ -38,7 +38,7 @@ INSTALL(FILES 231.key-manager-migrate-dkek.patch.sh 232.key-manager-change-user.patch.sh 233.key-manager-move-ss-migratable-data.patch.sh - DESTINATION ${RO_ETC_DIR}/opt/upgrade + DESTINATION ${UPGRADE_SCRIPT_DIR} PERMISSIONS OWNER_READ OWNER_WRITE diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec index b6b02b6d..72178448 100644 --- a/packaging/key-manager.spec +++ b/packaging/key-manager.spec @@ -48,6 +48,8 @@ Requires: libkey-manager-common = %{version}-%{release} %global initial_values_dir %{rw_data_dir}/initial_values %global ca_certs_dir %{?TZ_SYS_CA_CERTS:%TZ_SYS_CA_CERTS}%{!?TZ_SYS_CA_CERTS:%ro_etc_dir/ssl/certs} +%global upgrade_script_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:%_datadir}/upgrade/scripts + %description Central Key Manager daemon could be used as secure storage for certificate and private/public keys. It gives API for @@ -142,7 +144,8 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir},-Bsymbolic-functions " -DBIN_DIR=%{bin_dir} \ -DINITIAL_VALUES_DIR=%{initial_values_dir} \ -DDB_TEST_DIR=%{db_test_dir} \ - -DCA_CERTS_DIR=%{ca_certs_dir} + -DCA_CERTS_DIR=%{ca_certs_dir} \ + -DUPGRADE_SCRIPT_DIR=%{upgrade_script_dir} make %{?jobs:-j%jobs} @@ -245,10 +248,11 @@ fi %{ro_data_dir}/* %dir %attr(770, %{user_name}, %{group_name}) %{rw_data_dir} %dir %attr(770, %{user_name}, %{group_name}) %{initial_values_dir} -%{ro_etc_dir}/opt/upgrade/230.key-manager-change-data-dir.patch.sh -%{ro_etc_dir}/opt/upgrade/231.key-manager-migrate-dkek.patch.sh -%{ro_etc_dir}/opt/upgrade/232.key-manager-change-user.patch.sh -%{ro_etc_dir}/opt/upgrade/233.key-manager-move-ss-migratable-data.patch.sh + +%{upgrade_script_dir}/230.key-manager-change-data-dir.patch.sh +%{upgrade_script_dir}/231.key-manager-migrate-dkek.patch.sh +%{upgrade_script_dir}/232.key-manager-change-user.patch.sh +%{upgrade_script_dir}/233.key-manager-move-ss-migratable-data.patch.sh %{ro_etc_dir}/gumd/userdel.d/10_key-manager.post %{bin_dir}/ckm_tool |