aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClement Dransart <clement.dransart@awtce.be>2016-06-07 10:20:34 +0200
committerClement Dransart <clement.dransart@awtce.be>2016-06-17 18:27:30 +0200
commit8091c4a686f07a5c08acb7db1375288e55ed2301 (patch)
treeee38b484af64d5d609a1dada1181f854b63cda34
parent7045490a70d5e3968ca79074c6ab370830a5ccda (diff)
downloadmeta-ivi-8091c4a686f07a5c08acb7db1375288e55ed2301.tar.gz
meta-ivi-8091c4a686f07a5c08acb7db1375288e55ed2301.tar.bz2
meta-ivi-8091c4a686f07a5c08acb7db1375288e55ed2301.zip
dlt-daemon: use install locations from OE CMake
Signed-off-by: Clement Dransart <clement.dransart@awtce.be>
-rw-r--r--meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch26
-rw-r--r--meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb3
2 files changed, 28 insertions, 1 deletions
diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch
new file mode 100644
index 0000000..cbf049c
--- /dev/null
+++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon/0005-Fix-OE-cmake-installation-dir.patch
@@ -0,0 +1,26 @@
+From 39a5c3136ee0f84e29fe3c8121b3b61142a8a76f Mon Sep 17 00:00:00 2001
+From: Clement Dransart <clement.dransart@awtce.be>
+Date: Tue, 7 Jun 2016 11:02:12 +0200
+Subject: [meta-ivi][PATCH] Fix OE cmake installation dir
+
+Signed-off-by: Clement Dransart <clement.dransart@awtce.be>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46beec0..ad62848 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,7 +112,7 @@ ELSE (${WITH_DOC} STREQUAL "OFF")
+ SET(PACKAGE_DOC "")
+ ENDIF(${WITH_DOC} STREQUAL "OFF")
+
+-set(LIB_INSTALL_DIR lib${LIB_SUFFIX})
++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+
+ configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec)
+ configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
+--
+1.9.1
+
diff --git a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
index e117ad4..9177aa2 100644
--- a/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
+++ b/meta-ivi/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
@@ -20,7 +20,8 @@ SRC_URI = "git://git.projects.genivi.org/${PN}.git;branch=v2.11.x \
file://0001-Fix-build-with-systemd-209.patch \
file://0002-Don-t-execute-processes-as-a-specific-user.patch \
file://0003-systemd-unit-type-should-be-in-lowercase-so-use-Type.patch \
- file://0004-Modify-systemd-config-directory.patch"
+ file://0004-Modify-systemd-config-directory.patch \
+ file://0005-Fix-OE-cmake-installation-dir.patch"
S = "${WORKDIR}/git"
inherit gzipnative autotools gettext cmake systemd