Remove '/' from the end of rw_data_dir for manifest

filesystem path attribute on manifest file cannot parse
corretcly with '/' at the end of path. Smack label/type couldn't
set with it.

Add %dir directive on file list on %files. It's for removing all
resources and directories clearly when rpm update/remove.

Change-Id: I6bca24de763cc6754cd3c5a77cbf7a4ac6e86970
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c0e81c..2c9498f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,7 @@ SET(TARGET_PAM_KEY_MANAGER_PLUGIN "pam_key_manager_plugin")
 
 SET(TARGET_TEST_MERGED "ckm-tests-internal")
 
+STRING(REGEX REPLACE "/$" "" RW_DATA_DIR_WITHOUT_END_SLASH "${RW_DATA_DIR}")
 CONFIGURE_FILE(packaging/key-manager.manifest.in key-manager.manifest @ONLY)
 
 ADD_SUBDIRECTORY(data/scripts)

diff --git a/packaging/key-manager.manifest.in b/packaging/key-manager.manifest.in
index f089461..8d2a2a6 100644 (file)
--- a/packaging/key-manager.manifest.in
+++ b/packaging/key-manager.manifest.in
@@ -3,6 +3,6 @@
                <domain name="_" />
        </request>
        <assign>
-               <filesystem path="@RW_DATA_DIR@" label="System" type="transmutable" />
+               <filesystem path="@RW_DATA_DIR_WITHOUT_END_SLASH@" label="System" type="transmutable" />
        </assign>
 </manifest>

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 25ab0d4..e489e77 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -258,11 +258,12 @@ fi
 %{_unitdir}/sockets.target.wants/central-key-manager-api-encryption.socket
 %{_unitdir}/central-key-manager-api-encryption.socket
 %dir %{_datadir}/ckm
+%dir %{_datadir}/ckm/scripts
 %{_datadir}/ckm/initial_values.xsd
 %{_datadir}/ckm/sw_key.xsd
-%attr(770, %{user_name}, %{group_name}) %{rw_data_dir}
-%attr(770, %{user_name}, %{group_name}) %{initial_values_dir}
 %{_datadir}/ckm/scripts/*.sql
+%dir %attr(770, %{user_name}, %{group_name}) %{rw_data_dir}
+%dir %attr(770, %{user_name}, %{group_name}) %{initial_values_dir}
 /etc/opt/upgrade/230.key-manager-change-data-dir.patch.sh
 /etc/opt/upgrade/231.key-manager-migrate-dkek.patch.sh
 /etc/opt/upgrade/232.key-manager-change-user.patch.sh