meta-tizen: Fix security-server lib install dir in CMakeLists files

Change-Id: I2a9ca5afdbd8c559ee1cd278bc99b76a6c4aca4c
(From meta-tizen rev: 61ef952b5b7fa7671089bb9efa5fa59bfef6145c)

Signed-off-by: Xavier Roche <xavier.roche@open.eurogiciel.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-tizen/recipes-tizen/security-server/security-server-extraconf.inc b/meta-tizen/recipes-tizen/security-server/security-server-extraconf.inc
index 9eafa09..083f302 100644 (file)
--- a/meta-tizen/recipes-tizen/security-server/security-server-extraconf.inc
+++ b/meta-tizen/recipes-tizen/security-server/security-server-extraconf.inc
@@ -1,4 +1,4 @@
 inherit cmake
-SRC_URI += "file://deprecated-systemd.patch "
+SRC_URI += "file://Fix-lib-install-dir.patch "
                        
 CXXFLAGS += "-std=c++11"

diff --git a/meta-tizen/recipes-tizen/security-server/security-server/deprecated-systemd.patch b/meta-tizen/recipes-tizen/security-server/security-server/Fix-lib-install-dir.patch
similarity index 67%
rename from meta-tizen/recipes-tizen/security-server/security-server/deprecated-systemd.patch
rename to meta-tizen/recipes-tizen/security-server/security-server/Fix-lib-install-dir.patch
index 9b1678b..cd9c801 100644 (file)
--- a/meta-tizen/recipes-tizen/security-server/security-server/deprecated-systemd.patch
+++ b/meta-tizen/recipes-tizen/security-server/security-server/Fix-lib-install-dir.patch
@@ -1,33 +1,32 @@
-From b45e88111f94323e715c5ad4fd1527ea9099ce7b Mon Sep 17 00:00:00 2001
-From: Xavier Roche <xavrock.os@gmail.com>
-Date: Tue, 20 May 2014 09:51:34 +0200
-Subject: [PATCH] meta-tizen: Fix Security server build on Yocto poky
 
- - Fixing lib install dir in CMakeLists files and .pc template files
- - Fixing deprecated depedencies to systemd library
+From 61c10122d3655e89c289f89e610230591d2d080c Mon Sep 17 00:00:00 2001
+From: Xavier Roche <xavrock.os@gmail.com>
+Date: Mon, 26 May 2014 15:51:18 +0200
+Subject: [PATCH] meta-tizen: Fix lib install dir for Yocto build
 
 Signed-off-by: Xavier Roche <xavrock.os@gmail.com>
 ---
- CMakeLists.txt                              |    2 --
+ CMakeLists.txt                              |    3 ---
  build/security-server/CMakeLists.txt        |    2 +-
  build/security-server/security-server.pc.in |    2 +-
- src/CMakeLists.txt                          |    4 ++--
- src/server/CMakeLists.txt                   |    5 +++--
- 5 files changed, 7 insertions(+), 8 deletions(-)
+ src/CMakeLists.txt                          |    2 +-
+ src/server/CMakeLists.txt                   |    2 +-
+ 5 files changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 476b94a..09a1105 100644
+index 476b94a..516c6bf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -48,8 +48,6 @@ ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
+@@ -48,9 +48,6 @@ ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
  ADD_DEFINITIONS("-Wall")                        # Generate all warnings
  ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warnings
  
 -STRING(REGEX MATCH "([^.]*)" API_VERSION "${VERSION}")
 -ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"")
- 
+-
  ADD_DEFINITIONS("-DSMACK_ENABLED")
  
+ IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 diff --git a/build/security-server/CMakeLists.txt b/build/security-server/CMakeLists.txt
 index ddc0fb7..d65dd3a 100644
 --- a/build/security-server/CMakeLists.txt
@@ -52,18 +51,9 @@ index 608cb2d..df49caf 100644
  
  Name: security-server
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b0270d4..e238087 100644
+index b0270d4..87e9b3e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -3,7 +3,7 @@ PKG_CHECK_MODULES(SECURITY_SERVER_DEP
-     openssl
-     libsmack
-     libprivilege-control
--    libsystemd-daemon
-+    systemd
-     REQUIRED
-     )
- 
 @@ -93,7 +93,7 @@ TARGET_LINK_LIBRARIES(${TARGET_SECURITY_CLIENT}
  
  ################################################################################
@@ -74,23 +64,10 @@ index b0270d4..e238087 100644
  INSTALL(TARGETS ${TARGET_SECURITY_SERVER} DESTINATION bin)
  
 diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
-index 2cd6177..e493c51 100644
+index 2cd6177..0fad220 100644
 --- a/src/server/CMakeLists.txt
 +++ b/src/server/CMakeLists.txt
-@@ -1,5 +1,6 @@
- PKG_CHECK_MODULES(COMMON_DEP
-     dlog
-+    systemd
-     REQUIRED
-     )
- 
-@@ -44,10 +45,10 @@ SET_TARGET_PROPERTIES(
-     )
- 
- TARGET_LINK_LIBRARIES(${TARGET_SERVER_COMMON}
--    ${COMMON_DEP_LIBRARIES}
-+    ${COMMON_DEP_LIBRARIES} -lsystemd
-     )
+@@ -49,5 +49,5 @@ TARGET_LINK_LIBRARIES(${TARGET_SERVER_COMMON}
  
  ################################################################################