Add libsystemd-daemon build dependencies

[Bug]           LibIpc need libsystemd-daemon
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, install on target

Change-Id: I6da84631ed75e80d8e0f417dd4aacdc51f797a11

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 56ed2e7..c1fdd19 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -44,7 +44,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
 
 ## Link libraries ##############################################################
 FIND_PACKAGE(Boost COMPONENTS system filesystem)
-PKG_CHECK_MODULES(LIB_DEPS REQUIRED gio-2.0 libsystemd-daemon libcap-ng)
+PKG_CHECK_MODULES(LIB_DEPS REQUIRED gio-2.0 libcap-ng)
 INCLUDE_DIRECTORIES(SYSTEM ${LIB_DEPS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${COMMON_FOLDER})
 INCLUDE_DIRECTORIES(${LIBS_FOLDER})

diff --git a/libs/ipc/CMakeLists.txt b/libs/ipc/CMakeLists.txt
index d760883..84bb812 100644 (file)
--- a/libs/ipc/CMakeLists.txt
+++ b/libs/ipc/CMakeLists.txt
@@ -49,10 +49,12 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
     )
 
 ## Link libraries ##############################################################
+PKG_CHECK_MODULES(IPC_DEPS REQUIRED libsystemd-daemon)
+
 INCLUDE_DIRECTORIES(${LIBS_FOLDER})
 INCLUDE_DIRECTORIES(${COMMON_FOLDER})
-INCLUDE_DIRECTORIES(SYSTEM ${DBUS_DEPS_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} Logger Config)
+INCLUDE_DIRECTORIES(SYSTEM ${DBUS_DEPS_INCLUDE_DIRS} ${IPC_DEPS_INCLUDE_DIRS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${IPC_DEPS_LIBRARIES} Logger Config)
 
 ## Generate the pc file ########################################################
 CONFIGURE_FILE(${PC_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${PC_FILE} @ONLY)

diff --git a/packaging/vasum.spec b/packaging/vasum.spec
index 11c1599..3b241df 100644 (file)
--- a/packaging/vasum.spec
+++ b/packaging/vasum.spec
@@ -23,8 +23,6 @@ BuildRequires:  libjson-devel >= 0.10
 BuildRequires:  libcap-ng-devel
 BuildRequires:  lxc-devel
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libsystemd-journal)
-BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(sqlite3)
 Requires(post): libcap-tools
 Requires:       iproute2
@@ -261,6 +259,7 @@ systemctl daemon-reload
 %package -n libLogger
 Summary:            Logger library
 Group:              Security/Other
+BuildRequires:      pkgconfig(libsystemd-journal)
 Requires(post):     /sbin/ldconfig
 Requires(postun):   /sbin/ldconfig
 
@@ -364,6 +363,7 @@ The package provides libConfig development tools and libs.
 %package -n libIpc
 Summary:            IPC library
 Group:              Security/Other
+BuildRequires:      pkgconfig(libsystemd-daemon)
 Requires:           libConfig
 Requires(post):     /sbin/ldconfig
 Requires(postun):   /sbin/ldconfig

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 6181e15..f9ce867 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -30,7 +30,7 @@ ADD_EXECUTABLE(${SERVER_CODENAME} ${project_SRCS} ${common_SRCS})
 
 ## Link libraries ##############################################################
 FIND_PACKAGE(Boost COMPONENTS program_options system filesystem regex)
-PKG_CHECK_MODULES(SERVER_DEPS REQUIRED lxc json gio-2.0 libsystemd-journal libsystemd-daemon libcap-ng)
+PKG_CHECK_MODULES(SERVER_DEPS REQUIRED lxc json gio-2.0 libcap-ng)
 
 INCLUDE_DIRECTORIES(${COMMON_FOLDER})
 INCLUDE_DIRECTORIES(${LIBS_FOLDER})

diff --git a/tests/unit_tests/CMakeLists.txt b/tests/unit_tests/CMakeLists.txt
index 452a54a..2b5a09e 100644 (file)
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@@ -47,8 +47,7 @@ ADD_EXECUTABLE(${SOCKET_TEST_CODENAME} ${socket_test_SRCS} ${common_SRCS} ${clie
 ## Link libraries ##############################################################
 FIND_PACKAGE (Boost COMPONENTS unit_test_framework system filesystem regex)
 
-PKG_CHECK_MODULES(UT_SERVER_DEPS REQUIRED lxc json gio-2.0 libsystemd-daemon
-                  libsystemd-journal libcap-ng)
+PKG_CHECK_MODULES(UT_SERVER_DEPS REQUIRED lxc json gio-2.0 libcap-ng)
 INCLUDE_DIRECTORIES(${COMMON_FOLDER} ${SERVER_FOLDER} ${UNIT_TESTS_FOLDER} ${CLIENT_FOLDER}
                     ${LIBS_FOLDER} ${SOCKET_TEST_FOLDER})
 INCLUDE_DIRECTORIES(SYSTEM ${UT_SERVER_DEPS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})

diff --git a/wrapper/CMakeLists.txt b/wrapper/CMakeLists.txt
index 532e693..7f5ea46 100644 (file)
--- a/wrapper/CMakeLists.txt
+++ b/wrapper/CMakeLists.txt
@@ -51,7 +51,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
 
 ## Link libraries ##############################################################
 FIND_PACKAGE(Boost COMPONENTS system filesystem)
-PKG_CHECK_MODULES(LIB_DEPS REQUIRED gio-2.0 libsystemd-daemon libcap-ng)
+PKG_CHECK_MODULES(LIB_DEPS REQUIRED gio-2.0 libcap-ng)
 INCLUDE_DIRECTORIES(SYSTEM ${LIB_DEPS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${COMMON_FOLDER})
 INCLUDE_DIRECTORIES(${LIBS_FOLDER})

diff --git a/zone-daemon/CMakeLists.txt b/zone-daemon/CMakeLists.txt
index e721dbf..4d48141 100644 (file)
--- a/zone-daemon/CMakeLists.txt
+++ b/zone-daemon/CMakeLists.txt
@@ -31,7 +31,7 @@ ADD_EXECUTABLE(${ZONE_DAEMON_CODENAME} ${project_SRCS} ${common_SRCS})
 ## Link libraries ##############################################################
 FIND_PACKAGE (Boost COMPONENTS program_options system filesystem)
 
-PKG_CHECK_MODULES(ZONE_DAEMON_DEPS REQUIRED gio-2.0 libsystemd-journal libcap-ng)
+PKG_CHECK_MODULES(ZONE_DAEMON_DEPS REQUIRED gio-2.0 libcap-ng)
 
 INCLUDE_DIRECTORIES(${COMMON_FOLDER})
 INCLUDE_DIRECTORIES(${LIBS_FOLDER})