diff options
| author | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2016-01-08 13:32:28 +0100 |
|---|---|---|
| committer | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2016-01-14 09:38:36 +0100 |
| commit | a61e9ce01fa45323b381e6456d07117516d2e55d (patch) | |
| tree | 033ada39d5a6212a9c4d0d5282c53c551d0e9c20 /CMakeLists.txt | |
| parent | 8bc7217902a49348d31647251fe9f4937b08a5f3 (diff) | |
| download | key-manager-a61e9ce01fa45323b381e6456d07117516d2e55d.tar.gz key-manager-a61e9ce01fa45323b381e6456d07117516d2e55d.tar.bz2 key-manager-a61e9ce01fa45323b381e6456d07117516d2e55d.zip | |
Get dir locations from environment
[Problem] Key manager data dir location was hardcoded to /opt/data/ckm/. On
common profile image key-manager fails to start because of lack of /opt/data.
[Solution] Get directory locations from tizen platform config. Copy files
from old location if necessary. Make installation fail if runtime and compile
time settings differ. Provide upgrade script.
[Verification] Install key-manager package. Make sure all the content from
/opt/data/ckm/ has been moved to new location (/usr/data/ckm). Run tests. Make
sure all data is placed in new location. Run upgrade scripts
(/etc/opt/upgrad/*key-manager*.sh) on old version of ckm and check results.
Change-Id: Idafbe0fe43f1140c137f87883273b609a499b4cc
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d1a298a..3792afaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,9 @@ ADD_DEFINITIONS("-DSERVICE_NAME=\"${SERVICE_NAME}\"") ADD_DEFINITIONS("-DUSER_NAME=\"${USER_NAME}\"") 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("-DINITIAL_VALUES_DIR=\"${INITIAL_VALUES_DIR}\"") IF (CMAKE_BUILD_TYPE MATCHES "DEBUG") ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE") @@ -76,14 +79,9 @@ SET(TARGET_PAM_KEY_MANAGER_PLUGIN "pam_key_manager_plugin") SET(TARGET_TEST_MERGED "ckm-tests-internal") -INSTALL(FILES - ${CMAKE_CURRENT_BINARY_DIR}/data/scripts/230.key-manager-migrate-dkek.patch.sh - ${CMAKE_CURRENT_BINARY_DIR}/data/scripts/231.key-manager-change-user.patch.sh - DESTINATION /etc/opt/upgrade - PERMISSIONS OWNER_READ - OWNER_WRITE - OWNER_EXECUTE) +CONFIGURE_FILE(packaging/key-manager.manifest.in key-manager.manifest @ONLY) +ADD_SUBDIRECTORY(data/scripts) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(build) ADD_SUBDIRECTORY(systemd) |