From 1ca937b19ed870af4e0cf3d092dcf20cf20795c7 Mon Sep 17 00:00:00 2001 From: Angelos Evripiotis Date: Thu, 18 Oct 2018 16:36:25 +0100 Subject: BREAK: manual.yaml: don't set any default env vars Remove the 'MAKEFLAGS' and 'V' defaults. Now that there is a specialised 'make' element, these make-specific defaults don't make sense here. This element is meant to be a blank slate for folks to build on. Note that this is a breaking change, that will require some users to make changes to their .bst files if they are expecting these environment variable to be set. _versions.py: BST_FORMAT_VERSION bumped to 18. This fixes issue #718 --- NEWS | 6 ++++++ buildstream/_versions.py | 2 +- buildstream/plugins/elements/manual.yaml | 19 ------------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index ee7c1f4e5..589a2a206 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,12 @@ buildstream 1.3.1 ================= + o BREAKING CHANGE: The 'manual' element lost its default 'MAKEFLAGS' and 'V' + environment variables. There is already a 'make' element with the same + variables. Note that this is a breaking change, it will require users to + make changes to their .bst files if they are expecting these environment + variables to be set. + o Failed builds are included in the cache as well. `bst checkout` will provide anything in `%{install-root}`. A build including cached fails will cause any dependant elements diff --git a/buildstream/_versions.py b/buildstream/_versions.py index 8ad2f8cb7..842ac8bf8 100644 --- a/buildstream/_versions.py +++ b/buildstream/_versions.py @@ -23,7 +23,7 @@ # This version is bumped whenever enhancements are made # to the `project.conf` format or the core element format. # -BST_FORMAT_VERSION = 17 +BST_FORMAT_VERSION = 18 # The base BuildStream artifact version diff --git a/buildstream/plugins/elements/manual.yaml b/buildstream/plugins/elements/manual.yaml index cba5608cc..38fe7d163 100644 --- a/buildstream/plugins/elements/manual.yaml +++ b/buildstream/plugins/elements/manual.yaml @@ -1,11 +1,3 @@ -# No variables added for the manual element by default, set -# this if you plan to use make, and the sources cannot handle -# parallelization. -# -# variables: -# -# notparallel: True - # Manual build element does not provide any default # build commands config: @@ -28,14 +20,3 @@ config: strip-commands: - | %{strip-binaries} - -# Use max-jobs CPUs for building and enable verbosity -environment: - MAKEFLAGS: -j%{max-jobs} - V: 1 - -# And dont consider MAKEFLAGS or V as something which may -# affect build output. -environment-nocache: -- MAKEFLAGS -- V -- cgit v1.2.1