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. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ffac991..1d4200bf 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 -- cgit v1.2.1