aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOscar Andreasson <oscar.andreasson@pelagicore.com>2018-08-02 15:03:49 +0200
committerOscar Andreasson <oan@frozentux.net>2018-08-08 12:59:43 +0200
commitd128485c9730c9c71c270565327f8ec16f588edc (patch)
tree92c75f93dda069bba9c059bb73a1722775336282
parentf3a391193ba84ef1cfcb7e5dd31663015b1befe5 (diff)
downloadmeta-ivi-d128485c9730c9c71c270565327f8ec16f588edc.tar.gz
meta-ivi-d128485c9730c9c71c270565327f8ec16f588edc.tar.bz2
meta-ivi-d128485c9730c9c71c270565327f8ec16f588edc.zip
vsomeip: Resolve RPATH issues and use ninja
vsomeip contains some RPATH's to the build directores on the build host that are bad. Previously we handled it by removing them from the CMake link.txt files but they are no longer used since CMake is now using ninja as the underlying build system in yocto. First off, remove all the make related code, swap over to ninja, then run chrpath -d on all binaries in the -test package. Signed-off-by: Oscar Andreasson <oscar.andreasson@pelagicore.com>
-rw-r--r--meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend27
1 files changed, 17 insertions, 10 deletions
diff --git a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend
index e70dbbe..e40f1fe 100644
--- a/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend
+++ b/meta-ivi-test/recipes-core-ivi/vsomeip/vsomeip_%.bbappend
@@ -9,6 +9,8 @@ SRC_URI_append += " \
SRC_URI[md5sum] = "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
SRC_URI[sha256sum] = "247ca18dd83f53deb1328be17e4b1be31514cedfc1e3424f672bf11fd7e0d60d"
+RDEPENDS_${PN}-test += "bash"
+
EXTRA_OECONF += " -DTEST_IP_MASTER=10.0.3.1 -DTEST_IP_SLAVE=10.0.3.125 "
do_configure_prepend() {
export GTEST_ROOT=${WORKDIR}/gtest-1.7.0
@@ -16,21 +18,26 @@ do_configure_prepend() {
do_compile_append() {
_B=`pwd`
- perl -pi -e "s|-Wl,-rpath,${_B}:||" examples/CMakeFiles/*/link.txt
- make examples
+# perl -pi -e "s|-Wl,-rpath,${_B}||" build.ninja
+ ninja examples
- perl -pi -e "s|-Wl,-rpath,${_B}||" test/CMakeFiles/*/link.txt
- make build_tests
+ ninja build_tests
}
do_install_append() {
- perl -pi -e 's|../daemon/./vsomeipd|${bindir}/vsomeipd|' ${B}/test/*.sh
- install -d ${D}/opt/tests/${PN}/examples
- install -m 0755 ${B}/examples/*-sample ${D}/opt/tests/${PN}/examples
- for i in sh json test client service; do
- cp -f ${B}/test/*${i} ${D}/opt/tests/${PN}
- done
+ perl -pi -e 's|../daemon/./vsomeipd|${bindir}/vsomeipd|' ${B}/test/*.sh
+
+ install -d ${D}/opt/tests/${PN}/examples
+ install -m 0755 ${B}/examples/*-sample ${D}/opt/tests/${PN}/examples
+ for i in sh json test client service; do
+ cp -f ${B}/test/*${i} ${D}/opt/tests/${PN}
+ done
+
+ for i in test client service; do
+ chrpath -d ${D}/opt/tests/${PN}/*${i}
+ done
+ chrpath -d ${D}/opt/tests/${PN}/examples/*
install -m 0755 ${WORKDIR}/${BPN}_t.inc ${D}/opt/tests/${PN}
}