From da19a12f7aa632556b302f93f2c0cb956c014e08 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 19 Feb 2018 15:51:27 +0000 Subject: Update to build with BuildStream 1.0.1 We were previously building with an old 0.x version. This requires a fix to how we import the 'x86image' plugin from the bst-external plugins repo. It also requires a couple of fixes to elements which need to add things to the CMake configure commandline. These should use the new 'cmake-local' variable rather than overriding the configure-commands as a whole; the builds of these elements were breaking because the default commands changed upstream to expect out-of-tree builds. --- elements/genivi/genivi/DLT-daemon.bst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'elements/genivi/genivi/DLT-daemon.bst') diff --git a/elements/genivi/genivi/DLT-daemon.bst b/elements/genivi/genivi/DLT-daemon.bst index faface46..5a42b050 100644 --- a/elements/genivi/genivi/DLT-daemon.bst +++ b/elements/genivi/genivi/DLT-daemon.bst @@ -8,7 +8,5 @@ sources: url: upstream:DLT-daemon track: v2.15.0 ref: e9a486a08fff6d3cc7133a350cec3ee10f463207 -config: - configure-commands: - - cmake -DCMAKE_INSTALL_PREFIX="%{prefix}" -DCMAKE_INSTALL_LIBDIR="%{prefix}/lib" - -DWITH_SYSTEMD=ON +variables: + cmake-local: "-DWITH_SYSTEMD=ON" -- cgit v1.2.1