summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2018-10-18 16:36:25 +0100
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2018-11-01 11:35:02 +0000
commit4cfabce85b0108994687fb1ec0ad01cb7942e387 (patch)
treea2d44a33a18070b98dedca8a5176de96524cd5c0
parent89ace5d74de5f01dc7164fc30dae5e666bf3b592 (diff)
downloadbuildstream-4cfabce85b0108994687fb1ec0ad01cb7942e387.tar.gz
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
-rw-r--r--NEWS6
-rw-r--r--buildstream/_versions.py2
-rw-r--r--buildstream/plugins/elements/manual.yaml19
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