diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2018-01-22 12:48:39 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2018-01-22 15:16:23 +0000 |
| commit | e0072ed525ac239167d3f9753dc75e84deadfd0b (patch) | |
| tree | 0947721a26ff42f54d6aefe51e5a246844e2f53c /buildstream/plugins/elements/junction.py | |
| parent | 2e1cf4bf52821599776b42d2a66f54e8620a4200 (diff) | |
| download | buildstream-sam/recursive-pipelines-in-subdir.tar.gz | |
Add a 'path' config option to junction elementssam/recursive-pipelines-in-subdir
This makes it possible to depend on a project which is in a subdirectory
of a Git repository.
The error message given when the expected project.conf file is not found
has also been improved. Previously the error would look like this:
Error loading pipeline: Could not find file at
/home/sam/.cache/buildstream/build/freedesktop-sdk-junction-rvmn17s2/project.conf
This is giving the path of an internal temporary directory where the foreign
project's source is checked out. The new error gives more information:
Error loading pipeline: Could not find the project.conf file for junction
element at freedesktop-sdk-junction.bst [line 1 column 0]. Expecting a
project at path '.' within git source at freedesktop-sdk-junction.bst [line
4 column 2]
Diffstat (limited to 'buildstream/plugins/elements/junction.py')
| -rw-r--r-- | buildstream/plugins/elements/junction.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/buildstream/plugins/elements/junction.py b/buildstream/plugins/elements/junction.py index c0fd67d17..9a08edcc3 100644 --- a/buildstream/plugins/elements/junction.py +++ b/buildstream/plugins/elements/junction.py @@ -45,6 +45,9 @@ Overview machine_arch: "%{machine_arch}" debug: True + # Optionally look in a subpath of the source repository for the project + path: projects/hello + .. note:: Junction elements may not specify any dependencies as they are simply @@ -115,6 +118,7 @@ from buildstream._pipeline import PipelineError class JunctionElement(Element): def configure(self, node): + self.path = self.node_get_member(node, str, 'path', default='') self.options = self.node_get_member(node, Mapping, 'options', default={}) def preflight(self): |