diff options
| author | Phillip Smyth <phillip.smyth@codethink.co.uk> | 2018-03-07 15:02:01 +0000 |
|---|---|---|
| committer | Phillip Smyth <phillip.smyth@codethink.co.uk> | 2018-03-26 15:27:47 +0000 |
| commit | b0e6a45e7d34ef969734bc5c607ce97a229a4f77 (patch) | |
| tree | f87ede105b8912851530a702f945aa614d344516 /buildstream/buildelement.py | |
| parent | e91dc8336074d22126e559a29e23ef2d52c5506a (diff) | |
| download | buildstream-b0e6a45e7d34ef969734bc5c607ce97a229a4f77.tar.gz | |
Generate unique subdirs for built elements
Based on issue 89 (https://gitlab.com/BuildStream/buildstream/issues/89)
Ensuring that elements are staged into unique subdirs while building.
This patch supports that by doing the following:
* Modify project config to add 2 new variables ("project-name" and "element-name")
* Changed the default install-root from "/buildstream/install" to "/buildstream-install"
* Update the tests to accommodate these changes
* Update the expected cache keys in the tests
This fixes #89
Diffstat (limited to 'buildstream/buildelement.py')
| -rw-r--r-- | buildstream/buildelement.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/buildelement.py b/buildstream/buildelement.py index c275cfb9d..5a986bd11 100644 --- a/buildstream/buildelement.py +++ b/buildstream/buildelement.py @@ -90,7 +90,7 @@ of the staged sources. Result collection ~~~~~~~~~~~~~~~~~ Finally, the resulting build *artifact* is collected from the the ``%{install-root}`` -directory (which is normally configured as ``/buildstream/install``) inside the sandbox. +directory (which is normally configured as ``/buildstream-install``) inside the sandbox. All build elements must install into the ``%{install-root}`` using whatever semantic the given build system provides to do this. E.g. for standard autotools @@ -222,7 +222,7 @@ class BuildElement(Element): "will not be allowed to stage to %{build-root}.") # Return the payload, this is configurable but is generally - # always the /buildstream/install directory + # always the /buildstream-install directory return self.get_variable('install-root') def _get_commands(self, node, name): |