Fix rootstrap error

Change-Id: Ia9ebea239c5190d53e7b0d7173e49723cc21bacc
Signed-off-by: kyungwook tak <k.tak@samsung.com>

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 8c115aa..f5137b0 100755 (executable)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -40,14 +40,6 @@ Requires:   libkey-manager-client = %{version}-%{release}
 %description -n libkey-manager-client-devel
 Central Key Manager package (client-devel)
 
-%package -n key-manager-devel
-Summary:    Central Key Manager (Development)
-Group:      Development/Libraries
-Requires:   key-manager = %{version}-%{release}
-
-%description -n key-manager-devel
-Central Key Manager (Development)
-
 %package -n key-manager-tests
 Summary:    internal test for key-manager
 Group:      Development
@@ -131,8 +123,8 @@ fi
 %files -n key-manager
 %manifest %{_datadir}/key-manager.manifest
 %attr(755,root,root) /usr/bin/key-manager
-%{_libdir}/libkey-manager-commons.so.*
-%{_libdir}/libkey-manager-key-provider.so.*
+%{_libdir}/libkey-manager-commons.so*
+%{_libdir}/libkey-manager-key-provider.so*
 %attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/central-key-manager.service
 %attr(-,root,root) /usr/lib/systemd/system/central-key-manager.service
 %attr(-,root,root) /usr/lib/systemd/system/central-key-manager.target
@@ -146,10 +138,6 @@ fi
 %attr(-,root,root) /usr/lib/systemd/system/central-key-manager-api-ocsp.socket
 %{_datadir}/license/%{name}
 
-%files -n key-manager-devel
-%defattr(-,root,root,-)
-%{_libdir}/libkey-manager-key-provider.so
-
 %files -n libkey-manager-client
 %manifest %{_datadir}/libkey-manager-client.manifest
 %manifest %{_datadir}/libkey-manager-control-client.manifest
@@ -164,7 +152,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libkey-manager-client.so
 %{_libdir}/libkey-manager-control-client.so
-%{_libdir}/libkey-manager-commons.so
 %{_includedir}/ckm/ckm/ckm-manager.h
 %{_includedir}/ckm/ckm/ckm-certificate.h
 %{_includedir}/ckm/ckm/ckm-control.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 526525b..28f50f2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,8 +2,10 @@ PKG_CHECK_MODULES(KEY_MANAGER_DEP
     dlog
     openssl
     libsmack
+    libcrypto
     libsystemd-daemon
     capi-base-common
+    db-util
     REQUIRED
     )
 
@@ -56,8 +58,6 @@ TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER}
     ${TARGET_KEY_MANAGER_KEY_PROVIDER}
     )
 
-
-
 ################################################################################
 
 SET(KEY_MANAGER_CLIENT_VERSION_MAJOR 1)
@@ -82,6 +82,28 @@ SET(KEY_MANAGER_CLIENT_SOURCES
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-type.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-error.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-manager.cpp
+    ${KEY_MANAGER_PATH}/common/base64.cpp
+    ${KEY_MANAGER_PATH}/common/digest.cpp
+    ${KEY_MANAGER_PATH}/common/protocols.cpp
+    ${KEY_MANAGER_PATH}/common/message-buffer.cpp
+    ${KEY_MANAGER_PATH}/common/smack-check.cpp
+    ${KEY_MANAGER_PATH}/common/certificate-impl.cpp
+    ${KEY_MANAGER_PATH}/common/certificate-store.cpp
+    ${KEY_MANAGER_PATH}/common/generic-key.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/abstract_log_provider.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/dlog_log_provider.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/log.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/old_style_log_provider.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/binary_queue.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/colors.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/exception.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/noncopyable.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/serialization.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/singleton.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/string.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/TransitoryString.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES})
@@ -96,7 +118,6 @@ SET_TARGET_PROPERTIES(
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CLIENT}
     ${KEY_MANAGER_DEP_LIBRARIES}
-    ${TARGET_KEY_MANAGER_COMMON}
     )
 
 ################################################################################
@@ -118,6 +139,28 @@ SET(KEY_MANAGER_CONTROL_CLIENT_SOURCES
     ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-control.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-common.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-control.cpp
+    ${KEY_MANAGER_PATH}/common/base64.cpp
+    ${KEY_MANAGER_PATH}/common/digest.cpp
+    ${KEY_MANAGER_PATH}/common/protocols.cpp
+    ${KEY_MANAGER_PATH}/common/message-buffer.cpp
+    ${KEY_MANAGER_PATH}/common/smack-check.cpp
+    ${KEY_MANAGER_PATH}/common/certificate-impl.cpp
+    ${KEY_MANAGER_PATH}/common/certificate-store.cpp
+    ${KEY_MANAGER_PATH}/common/generic-key.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/abstract_log_provider.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/dlog_log_provider.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/log.cpp
+    ${KEY_MANAGER_PATH}/dpl/log/src/old_style_log_provider.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/binary_queue.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/colors.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/exception.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/noncopyable.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/serialization.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/singleton.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/string.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/TransitoryString.cpp
+    ${KEY_MANAGER_PATH}/dpl/core/src/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CLIENT_SOURCES})
@@ -132,7 +175,6 @@ SET_TARGET_PROPERTIES(
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CONTROL_CLIENT}
     ${KEY_MANAGER_DEP_LIBRARIES}
-    ${TARGET_KEY_MANAGER_COMMON}
     )
 
 ################################################################################

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index cdf1285..f753440 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -12,6 +12,9 @@ PKG_CHECK_MODULES(KEY_PROVIDER_DEP
     REQUIRED
     )
 
+SET(KEY_MANAGER_COMMON_VERSION_MAJOR 1)
+SET(KEY_MANAGER_COMMON_VERSION ${KEY_MANAGER_COMMON_VERSION_MAJOR}.0.1)
+
 SET(COMMON_PATH ${PROJECT_SOURCE_DIR}/src/manager)
 
 SET(COMMON_SOURCES
@@ -61,8 +64,8 @@ SET_TARGET_PROPERTIES(
     ${TARGET_KEY_MANAGER_COMMON}
     PROPERTIES
         COMPILE_FLAGS "-D_GNU_SOURCE -fPIC -fvisibility=default"
-        SOVERSION 1.0.0
-        VERSION 1.0.0
+        SOVERSION ${KEY_MANAGER_COMMON_VERSION_MAJOR}
+        VERSION ${KEY_MANAGER_COMMON_VERSION}
     )
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_COMMON}