summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2018-02-19 15:51:27 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2018-02-23 13:47:51 (GMT)
commitda19a12f7aa632556b302f93f2c0cb956c014e08 (patch)
tree9154e6daabcf44b74ca2ada6246d4d0f4594b0fe
parenta8363d777d9c7bc9413f3765152dc6382e767b52 (diff)
downloaddefinitions-da19a12f7aa632556b302f93f2c0cb956c014e08.tar.gz
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.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--elements/bluetooth/libical.bst5
-rw-r--r--elements/genivi/genivi/DLT-daemon.bst6
-rw-r--r--elements/gnome/gnome/WebKitGtk.bst8
-rw-r--r--elements/gnome/gnome/evolution-data-server.bst6
-rw-r--r--elements/gnome/gnome/evolution.bst4
-rw-r--r--elements/navigation/navit.bst5
-rw-r--r--elements/systems/minimal-system-image-x86_64.bst2
-rw-r--r--project.conf6
9 files changed, 28 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ffac99..1d4200b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
.bst_before_script: &bst_before_script
before_script:
- |
- export BST_SHA='3fd7fe1fd3406fc9c35d0d2719085809c48247c7'
+ export BST_SHA='b340f995455b997995fc55277a993d5f5a1656e5' # 1.0.1
export BST_EXTERNAL_SHA='90edaa55568207c55dc12268ef01998584dd7af5'
git clone https://gitlab.com/BuildStream/buildstream.git
# Use specific version of BuildStream
diff --git a/elements/bluetooth/libical.bst b/elements/bluetooth/libical.bst
index e5df04c..8efd7d0 100644
--- a/elements/bluetooth/libical.bst
+++ b/elements/bluetooth/libical.bst
@@ -7,6 +7,5 @@ sources:
url: upstream:libical-git
track: v2.0.0
ref: 6c4af23b0a95fd105f38e879908cbc80390f3716
-config:
- configure-commands:
- - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%{prefix}" -DCMAKE_INSTALL_LIBDIR=lib
+variables:
+ cmake-local: '-DCMAKE_BUILD_TYPE=Release '
diff --git a/elements/genivi/genivi/DLT-daemon.bst b/elements/genivi/genivi/DLT-daemon.bst
index faface4..5a42b05 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"
diff --git a/elements/gnome/gnome/WebKitGtk.bst b/elements/gnome/gnome/WebKitGtk.bst
index d4a793a..e332965 100644
--- a/elements/gnome/gnome/WebKitGtk.bst
+++ b/elements/gnome/gnome/WebKitGtk.bst
@@ -27,7 +27,7 @@ sources:
url: upstream:WebKitGtk-tarball
track: webkitgtk-2.16.5
ref: 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c
-config:
- configure-commands:
- - CXXFLAGS=-Wno-expansion-to-defined cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_INSTALL_PREFIX="%{prefix}" -DCMAKE_INSTALL_LIBDIR=lib
+variables:
+ cmake-local: "-DPORT=GTK -DCMAKE_BUILD_TYPE=Release"
+environment:
+ CXXFLAGS: "-Wno-expansion-to-defined"
diff --git a/elements/gnome/gnome/evolution-data-server.bst b/elements/gnome/gnome/evolution-data-server.bst
index b396589..94bb45e 100644
--- a/elements/gnome/gnome/evolution-data-server.bst
+++ b/elements/gnome/gnome/evolution-data-server.bst
@@ -30,8 +30,14 @@ sources:
url: upstream:evolution-data-server
track: gnome-3-24
ref: 6ad2fc6fba46d79449be4090eafd91015d0d8cce
+
+# Note that this version of e-d-s fails to build when builddir != srcdir.
config:
configure-commands:
- cmake -DCMAKE_INSTALL_PREFIX="%{prefix}" -DSYSCONFDIR=/etc -DENABLE_INTROSPECTION=ON
-DENABLE_UOA=OFF -DENABLE_VALA_BINDINGS=ON -DWITH_LIBDB=OFF -DWITH_OPENLDAP=OFF
.
+ build-commands:
+ - make
+ install-commands:
+ - make -j1 DESTDIR="%{install-root}" install
diff --git a/elements/gnome/gnome/evolution.bst b/elements/gnome/gnome/evolution.bst
index 0ca7f81..855b707 100644
--- a/elements/gnome/gnome/evolution.bst
+++ b/elements/gnome/gnome/evolution.bst
@@ -42,3 +42,7 @@ config:
- cmake . -DCMAKE_INSTALL_PREFIX="%{prefix}" -DENABLE_AUTOAR=OFF -DENABLE_CONTACT_MAPS=ON
-DENABLE_GTKSPELL=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_PST_IMPORT=OFF -DENABLE_TEXT_HIGHLIGHT=OFF
-DENABLE_YTNEF=OFF -DWITH_OPENLDAP=OFF
+ build-commands:
+ - make
+ install-commands:
+ - make -j1 DESTDIR="%{install-root}" install
diff --git a/elements/navigation/navit.bst b/elements/navigation/navit.bst
index c317403..70ae336 100644
--- a/elements/navigation/navit.bst
+++ b/elements/navigation/navit.bst
@@ -6,6 +6,5 @@ sources:
url: upstream:navit-svn
track: master
ref: 358812af2c27c4abe324beb205e6d156b96fb1ea
-config:
- configure-commands:
- - cmake . -DSAMPLE_MAP=n
+variables:
+ cmake-local: '-DSAMPLE_MAP=n'
diff --git a/elements/systems/minimal-system-image-x86_64.bst b/elements/systems/minimal-system-image-x86_64.bst
index d92d5fd..71338f3 100644
--- a/elements/systems/minimal-system-image-x86_64.bst
+++ b/elements/systems/minimal-system-image-x86_64.bst
@@ -1,4 +1,4 @@
-kind: buildstream-external:x86image
+kind: x86image
description: Create a deployment of the minimal system
depends:
- filename: systems/minimal-system.bst
diff --git a/project.conf b/project.conf
index 5573a2f..d2674f7 100644
--- a/project.conf
+++ b/project.conf
@@ -134,3 +134,9 @@ split-rules:
(>):
- |
%{prefix}/src/**
+
+plugins:
+ - origin: pip
+ package-name: buildstream-external
+ elements:
+ x86image: 0