Fix hard-coded paths and test res installation

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c9498f..953dc78 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,17 +59,15 @@ ADD_DEFINITIONS("-DGROUP_NAME=\"${GROUP_NAME}\"")
 ADD_DEFINITIONS("-DSMACK_DOMAIN_NAME=\"${SMACK_DOMAIN_NAME}\"")
 ADD_DEFINITIONS("-DRW_DATA_DIR=\"${RW_DATA_DIR}\"")
 ADD_DEFINITIONS("-DRO_DATA_DIR=\"${RO_DATA_DIR}\"")
+ADD_DEFINITIONS("-DETC_DIR=\"${ETC_DIR}\"")
 ADD_DEFINITIONS("-DINITIAL_VALUES_DIR=\"${INITIAL_VALUES_DIR}\"")
+ADD_DEFINITIONS("-DSYSTEMD_ENV_FILE=\"${SYSTEMD_ENV_FILE}\"")
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
     ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
     ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
 ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
-IF (DEFINED SYSTEMD_ENV_FILE)
-    ADD_DEFINITIONS(-DSYSTEMD_ENV_FILE="${SYSTEMD_ENV_FILE}")
-ENDIF (DEFINED SYSTEMD_ENV_FILE)
-
 SET(TARGET_KEY_MANAGER "key-manager")
 SET(TARGET_KEY_MANAGER_CLIENT "key-manager-client")
 SET(TARGET_KEY_MANAGER_CONTROL_CLIENT "key-manager-control-client")

diff --git a/data/scripts/CMakeLists.txt b/data/scripts/CMakeLists.txt
index 8cf7b71..20d47c6 100644 (file)
--- a/data/scripts/CMakeLists.txt
+++ b/data/scripts/CMakeLists.txt
@@ -33,7 +33,7 @@ INSTALL(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/230.key-manager-change-data-dir.patch.sh
         ${CMAKE_CURRENT_BINARY_DIR}/231.key-manager-migrate-dkek.patch.sh
         ${CMAKE_CURRENT_BINARY_DIR}/232.key-manager-change-user.patch.sh
-        DESTINATION /etc/opt/upgrade
+        DESTINATION ${ETC_DIR}/opt/upgrade
         PERMISSIONS OWNER_READ
                     OWNER_WRITE
-                    OWNER_EXECUTE)
\ No newline at end of file
+                    OWNER_EXECUTE)

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index fe95482..12bce6a 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -36,11 +36,12 @@ Requires: libkey-manager-common = %{version}-%{release}
 %global user_name key-manager
 %global group_name key-manager
 %global service_name key-manager
-%global _rundir /run
 %global smack_domain_name System
 %global rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}
 %global ro_data_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm/}%{!?TZ_SYS_SHARE:/usr/share/ckm/}
 %global db_test_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm-db-test/}%{!?TZ_SYS_SHARE:/usr/share/ckm-db-test/}
+%global etc_dir %{?TZ_SYS_ETC:%TZ_SYS_ETC/}%{!?TZ_SYS_ETC:/etc/}
+%global run_dir %{?TZ_SYS_RUN:%TZ_SYS_RUN/}%{!?TZ_SYS_RUN:/var/run/}
 %global initial_values_dir %{rw_data_dir}initial_values/
 
 %description
@@ -123,8 +124,8 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir},-Bsymbolic-functions "
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DSYSTEMD_UNIT_DIR=%{_unitdir} \
-        -DSYSTEMD_ENV_FILE="/etc/sysconfig/central-key-manager" \
-        -DRUN_DIR:PATH=%{_rundir} \
+        -DSYSTEMD_ENV_FILE=%{etc_dir}"/sysconfig/central-key-manager" \
+        -DRUN_DIR:PATH=%{run_dir} \
         -DSERVICE_NAME=%{service_name} \
         -DUSER_NAME=%{user_name} \
         -DGROUP_NAME=%{group_name} \
@@ -132,6 +133,7 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir},-Bsymbolic-functions "
         -DMOCKUP_SM=%{?mockup_sm:%mockup_sm}%{!?mockup_sm:OFF} \
         -DRW_DATA_DIR=%{rw_data_dir} \
         -DRO_DATA_DIR=%{ro_data_dir} \
+        -DETC_DIR=%{etc_dir} \
         -DINITIAL_VALUES_DIR=%{initial_values_dir} \
         -DDB_TEST_DIR=%{db_test_dir}
 
@@ -140,30 +142,12 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{initial_values_dir}
-mkdir -p %{buildroot}/etc/security/
 mkdir -p %{buildroot}%{ro_data_dir}/scripts
-mkdir -p %{buildroot}/etc/gumd/userdel.d/
+mkdir -p %{buildroot}%{etc_dir}/gumd/userdel.d/
 cp data/scripts/*.sql %{buildroot}%{ro_data_dir}/scripts
 cp doc/initial_values.xsd %{buildroot}%{ro_data_dir}
 cp doc/sw_key.xsd %{buildroot}%{ro_data_dir}
-cp data/gumd/10_key-manager.post %{buildroot}/etc/gumd/userdel.d/
-
-mkdir -p %{buildroot}%{db_test_dir}
-cp tests/testme_ver1.db %{buildroot}%{db_test_dir}
-cp tests/testme_ver2.db %{buildroot}%{db_test_dir}
-cp tests/testme_ver3.db %{buildroot}%{db_test_dir}
-cp tests/XML_1_okay.xml %{buildroot}%{db_test_dir}
-cp tests/XML_1_okay.xsd %{buildroot}%{db_test_dir}
-cp tests/XML_1_wrong.xml %{buildroot}%{db_test_dir}
-cp tests/XML_1_wrong.xsd %{buildroot}%{db_test_dir}
-cp tests/XML_2_structure.xml %{buildroot}%{db_test_dir}
-cp tests/XML_3_encrypted.xml %{buildroot}%{db_test_dir}
-cp tests/XML_3_encrypted.xsd %{buildroot}%{db_test_dir}
-cp tests/XML_4_device_key.xml %{buildroot}%{db_test_dir}
-cp tests/XML_4_device_key.xsd %{buildroot}%{db_test_dir}
-cp tests/encryption-scheme/db/db-7654 %{buildroot}%{db_test_dir}/db-7654
-cp tests/encryption-scheme/db/db-key-7654 %{buildroot}%{db_test_dir}/db-key-7654
-cp tests/encryption-scheme/db/key-7654 %{buildroot}%{db_test_dir}/key-7654
+cp data/gumd/10_key-manager.post %{buildroot}%{etc_dir}/gumd/userdel.d/
 
 %make_install
 %install_service multi-user.target.wants central-key-manager.service
@@ -264,10 +248,10 @@ fi
 %{_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
-/etc/gumd/userdel.d/10_key-manager.post
+%{etc_dir}/opt/upgrade/230.key-manager-change-data-dir.patch.sh
+%{etc_dir}/opt/upgrade/231.key-manager-migrate-dkek.patch.sh
+%{etc_dir}/opt/upgrade/232.key-manager-change-user.patch.sh
+%{etc_dir}/gumd/userdel.d/10_key-manager.post
 %{_bindir}/ckm_tool
 
 %files -n key-manager-pam-plugin
@@ -308,24 +292,7 @@ fi
 %files -n key-manager-tests
 %manifest key-manager-tests.manifest
 %{_bindir}/ckm-tests-internal
-%dir %{_datadir}/ckm-db-test
-%{_datadir}/ckm-db-test/testme_ver1.db
-%{_datadir}/ckm-db-test/testme_ver2.db
-%{_datadir}/ckm-db-test/testme_ver3.db
-%{_datadir}/ckm-db-test/XML_1_okay.xml
-%{_datadir}/ckm-db-test/XML_1_okay.xsd
-%{_datadir}/ckm-db-test/XML_1_wrong.xml
-%{_datadir}/ckm-db-test/XML_1_wrong.xsd
-%{_datadir}/ckm-db-test/XML_2_structure.xml
-%{_datadir}/ckm-db-test/XML_3_encrypted.xml
-%{_datadir}/ckm-db-test/XML_3_encrypted.xsd
-%{_datadir}/ckm-db-test/XML_4_device_key.xml
-%{_datadir}/ckm-db-test/XML_4_device_key.xsd
-%{_datadir}/ckm-db-test/db-7654
-%{_datadir}/ckm-db-test/db-key-7654
-%{_datadir}/ckm-db-test/key-7654
-%{_datadir}/ckm-db-test/encryption-scheme.p12
 %{_bindir}/ckm_so_loader
 %{_bindir}/ckm_db_tool
 %{_bindir}/ckm_generate_db
-
+%db_test_dir

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dcad88c..b788fac 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 PKG_CHECK_MODULES(KEY_MANAGER_TEST_DEP
-    libxml-2.0
     REQUIRED
+    libxml-2.0
     )
 
 FIND_PACKAGE(Threads REQUIRED)
@@ -71,5 +71,25 @@ TARGET_LINK_LIBRARIES(${TARGET_TEST_MERGED}
     )
 
 INSTALL(TARGETS ${TARGET_TEST_MERGED} DESTINATION bin)
+INSTALL(
+    FILES
+        resources/XML_1_okay.xml
+        resources/XML_1_okay.xsd
+        resources/XML_1_wrong.xml
+        resources/XML_1_wrong.xsd
+        resources/XML_2_structure.xml
+        resources/XML_3_encrypted.xml
+        resources/XML_3_encrypted.xsd
+        resources/XML_4_device_key.xml
+        resources/XML_4_device_key.xsd
+        resources/encryption-scheme.p12
+        resources/db-7654
+        resources/db-key-7654
+        resources/key-7654
+        resources/testme_ver1.db
+        resources/testme_ver2.db
+        resources/testme_ver3.db
+    DESTINATION ${DB_TEST_DIR}
+    )
 
-ADD_SUBDIRECTORY(encryption-scheme)
\ No newline at end of file
+ADD_SUBDIRECTORY(encryption-scheme)

diff --git a/tests/encryption-scheme/CMakeLists.txt b/tests/encryption-scheme/CMakeLists.txt
index bfd0a6c..ce4d98a 100644 (file)
--- a/tests/encryption-scheme/CMakeLists.txt
+++ b/tests/encryption-scheme/CMakeLists.txt
@@ -84,5 +84,3 @@ TARGET_LINK_LIBRARIES(${TARGET_CKM_GENERATOR}
 )
 
 INSTALL(TARGETS ${TARGET_CKM_GENERATOR} DESTINATION bin)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/encryption-scheme.p12 DESTINATION ${DB_TEST_DIR})
\ No newline at end of file

diff --git a/tests/XML_1_okay.xml b/tests/resources/XML_1_okay.xml
similarity index 100%
rename from tests/XML_1_okay.xml
rename to tests/resources/XML_1_okay.xml

diff --git a/tests/XML_1_okay.xsd b/tests/resources/XML_1_okay.xsd
similarity index 100%
rename from tests/XML_1_okay.xsd
rename to tests/resources/XML_1_okay.xsd

diff --git a/tests/XML_1_wrong.xml b/tests/resources/XML_1_wrong.xml
similarity index 100%
rename from tests/XML_1_wrong.xml
rename to tests/resources/XML_1_wrong.xml

diff --git a/tests/XML_1_wrong.xsd b/tests/resources/XML_1_wrong.xsd
similarity index 100%
rename from tests/XML_1_wrong.xsd
rename to tests/resources/XML_1_wrong.xsd

diff --git a/tests/XML_2_structure.xml b/tests/resources/XML_2_structure.xml
similarity index 100%
rename from tests/XML_2_structure.xml
rename to tests/resources/XML_2_structure.xml

diff --git a/tests/XML_3_encrypted.xml b/tests/resources/XML_3_encrypted.xml
similarity index 100%
rename from tests/XML_3_encrypted.xml
rename to tests/resources/XML_3_encrypted.xml

diff --git a/tests/XML_3_encrypted.xsd b/tests/resources/XML_3_encrypted.xsd
similarity index 100%
rename from tests/XML_3_encrypted.xsd
rename to tests/resources/XML_3_encrypted.xsd

diff --git a/tests/XML_4_device_key.xml b/tests/resources/XML_4_device_key.xml
similarity index 100%
rename from tests/XML_4_device_key.xml
rename to tests/resources/XML_4_device_key.xml

diff --git a/tests/XML_4_device_key.xsd b/tests/resources/XML_4_device_key.xsd
similarity index 100%
rename from tests/XML_4_device_key.xsd
rename to tests/resources/XML_4_device_key.xsd

diff --git a/tests/encryption-scheme/db/db-7654 b/tests/resources/db-7654
similarity index 100%
rename from tests/encryption-scheme/db/db-7654
rename to tests/resources/db-7654

diff --git a/tests/encryption-scheme/db/db-key-7654 b/tests/resources/db-key-7654
similarity index 100%
rename from tests/encryption-scheme/db/db-key-7654
rename to tests/resources/db-key-7654

diff --git a/tests/encryption-scheme/encryption-scheme.p12 b/tests/resources/encryption-scheme.p12
similarity index 100%
rename from tests/encryption-scheme/encryption-scheme.p12
rename to tests/resources/encryption-scheme.p12

diff --git a/tests/encryption-scheme/db/key-7654 b/tests/resources/key-7654
similarity index 100%
rename from tests/encryption-scheme/db/key-7654
rename to tests/resources/key-7654

diff --git a/tests/testme_ver1.db b/tests/resources/testme_ver1.db
similarity index 100%
rename from tests/testme_ver1.db
rename to tests/resources/testme_ver1.db

diff --git a/tests/testme_ver2.db b/tests/resources/testme_ver2.db
similarity index 100%
rename from tests/testme_ver2.db
rename to tests/resources/testme_ver2.db

diff --git a/tests/testme_ver3.db b/tests/resources/testme_ver3.db
similarity index 100%
rename from tests/testme_ver3.db
rename to tests/resources/testme_ver3.db