From 13b075f1366d0082cd91abe28646fe367bd0f8da Mon Sep 17 00:00:00 2001 From: Phillip Smyth Date: Wed, 7 Mar 2018 15:02:01 +0000 Subject: Generate unique subdirs for built elements Based on issue 89 (https://gitlab.com/BuildStream/buildstream/issues/89) there has been interest in 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") * 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 --- buildstream/buildelement.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildstream/buildelement.py') 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): -- cgit v1.2.1