Add new package with common library

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 639386b..70971d7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,8 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 SET(TARGET_KEY_MANAGER "key-manager")
 SET(TARGET_KEY_MANAGER_CLIENT "key-manager-client")
 SET(TARGET_KEY_MANAGER_CONTROL_CLIENT "key-manager-control-client")
-SET(TARGET_KEY_MANAGER_COMMON "key-manager-commons")
+SET(TARGET_KEY_MANAGER_COMMON "key-manager-common")
+SET(TARGET_KEY_MANAGER_KEY_PROVIDER "key-manager-key-provider")
 SET(TARGET_LISTENER "key-manager-listener")
 
 SET(TARGET_TEST_MERGED "ckm-tests-internal")

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 55a935d..f3258e3 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -8,6 +8,7 @@ Source0:    %{name}-%{version}.tar.gz
 Source1001: key-manager.manifest
 Source1002: key-manager-listener.manifest
 Source1003: libkey-manager-client.manifest
+Source1004: libkey-manager-common.manifest
 BuildRequires: cmake
 BuildRequires: zip
 BuildRequires: pkgconfig(dlog)
@@ -20,6 +21,7 @@ BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: boost-devel
 Requires: boost-test
+Requires: libkey-manager-common = %{version}-%{release}
 %{?systemd_requires}
 
 %description
@@ -35,6 +37,15 @@ Listener for central key manager. This daemon is responsible for
 receive notification from dbus about uninstall application
 and notify central key manager about it.
 
+%package -n libkey-manager-common
+Summary:    Central Key Manager (common libraries)
+Group:      Development/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
+%description -n libkey-manager-common
+Central Key Manager package (common library)
+
 %package -n libkey-manager-client
 Summary:    Central Key Manager (client)
 Group:      Development/Libraries
@@ -68,6 +79,7 @@ Internal test for key-manager
 cp -a %{SOURCE1001} .
 cp -a %{SOURCE1002} .
 cp -a %{SOURCE1003} .
+cp -a %{SOURCE1004} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -158,38 +170,40 @@ fi
 
 %files -n key-manager
 %manifest key-manager.manifest
-%attr(755,root,root) /usr/bin/key-manager
-%{_libdir}/libkey-manager-commons.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
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/central-key-manager-api-control.socket
-%attr(-,root,root) /usr/lib/systemd/system/central-key-manager-api-control.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/central-key-manager-api-storage.socket
-%attr(-,root,root) /usr/lib/systemd/system/central-key-manager-api-storage.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/central-key-manager-api-ocsp.socket
-%attr(-,root,root) /usr/lib/systemd/system/central-key-manager-api-ocsp.socket
+%{_bindir}/key-manager
+%{_libdir}/systemd/system/multi-user.target.wants/central-key-manager.service
+%{_libdir}/systemd/system/central-key-manager.service
+%{_libdir}/systemd/system/central-key-manager.target
+%{_libdir}/systemd/system/sockets.target.wants/central-key-manager-api-control.socket
+%{_libdir}/systemd/system/central-key-manager-api-control.socket
+%{_libdir}/systemd/system/sockets.target.wants/central-key-manager-api-storage.socket
+%{_libdir}/systemd/system/central-key-manager-api-storage.socket
+%{_libdir}/systemd/system/sockets.target.wants/central-key-manager-api-ocsp.socket
+%{_libdir}/systemd/system/central-key-manager-api-ocsp.socket
 %{_datadir}/license/%{name}
 
 %files -n key-manager-listener
 %manifest key-manager-listener.manifest
-%attr(755,root,root) /usr/bin/key-manager-listener
-%attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/central-key-manager-listener.service
-%attr(-,root,root) /usr/lib/systemd/system/central-key-manager-listener.service
+%{_bindir}/key-manager-listener
+%{_libdir}/systemd/system/multi-user.target.wants/central-key-manager-listener.service
+%{_libdir}/systemd/system/central-key-manager-listener.service
+
+%files -n libkey-manager-common
+%manifest libkey-manager-common.manifest
+%{_libdir}/libkey-manager-common.so.*
 
 %files -n libkey-manager-client
 %manifest libkey-manager-client.manifest
-%defattr(-,root,root,-)
 %{_libdir}/libkey-manager-client.so.*
 %{_libdir}/libkey-manager-control-client.so.*
 %{_datadir}/license/libkey-manager-client
 %{_datadir}/license/libkey-manager-control-client
 
-
 %files -n libkey-manager-client-devel
 %defattr(-,root,root,-)
 %{_libdir}/libkey-manager-client.so
 %{_libdir}/libkey-manager-control-client.so
+%{_libdir}/libkey-manager-common.so
 %{_includedir}/ckm/ckm/ckm-manager.h
 %{_includedir}/ckm/ckm/ckm-certificate.h
 %{_includedir}/ckm/ckm/ckm-control.h

diff --git a/packaging/libkey-manager-common.manifest b/packaging/libkey-manager-common.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/packaging/libkey-manager-common.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fdcc3aa..943bb27 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,28 +82,6 @@ SET(KEY_MANAGER_CLIENT_SOURCES
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-error.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-manager.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.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/key-impl.cpp
-    ${KEY_MANAGER_PATH}/common/pkcs12-impl.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/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES})
@@ -118,6 +96,7 @@ SET_TARGET_PROPERTIES(
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CLIENT}
     ${KEY_MANAGER_DEP_LIBRARIES}
+    ${TARGET_KEY_MANAGER_COMMON}
     )
 
 ################################################################################
@@ -141,27 +120,6 @@ SET(KEY_MANAGER_CONTROL_CLIENT_SOURCES
     ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-common.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-control.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.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/key-impl.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/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CLIENT_SOURCES})
@@ -176,6 +134,7 @@ 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 817583a..26c05f3 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -66,6 +66,7 @@ TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_COMMON}
     ${COMMON_DEP_LIBRARIES}
     )
 
-################################################################################
+##########################################################################
+
 
 INSTALL(TARGETS ${TARGET_KEY_MANAGER_COMMON} DESTINATION ${LIB_INSTALL_DIR})