From b2e7d3c81af118f01c1c9895dd230147e5d75ef7 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Sat, 7 Oct 2017 20:50:11 +0900 Subject: _pipeline.py: Removing arches Also now the integration option to `bst checkout` is explicit, as we dont have knowledge of arches anymore. --- buildstream/_pipeline.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py index 08f231723..edaf13318 100644 --- a/buildstream/_pipeline.py +++ b/buildstream/_pipeline.py @@ -142,8 +142,7 @@ class Pipeline(): self._resolved_elements = {} loader = Loader(self.project.element_path, targets, - self.project._options, - context.host_arch, context.target_arch) + self.project._options) meta_elements = loader.load(rewritable, load_ticker) if load_ticker: load_ticker(None) @@ -476,8 +475,9 @@ class Pipeline(): # Args: # directory (str): The directory to checkout the artifact to # force (bool): Force overwrite files which exist in `directory` + # integrate (bool): Whether to run integration commands # - def checkout(self, directory, force): + def checkout(self, directory, force, integrate): # We only have one target in a checkout command target = self.targets[0] @@ -493,16 +493,8 @@ class Pipeline(): raise PipelineError("Checkout directory is not empty: {}" .format(directory)) - # BuildStream will one day be able to run host-incompatible binaries - # by using a QEMU sandbox, but for now we need to disable integration - # commands for cross-build artifacts. - can_integrate = (self.context.host_arch == self.context.target_arch) - if not can_integrate: - self.message(MessageType.WARN, - "Host-incompatible checkout -- no integration commands can be run") - # Stage deps into a temporary sandbox first - with target._prepare_sandbox(Scope.RUN, None, integrate=can_integrate) as sandbox: + with target._prepare_sandbox(Scope.RUN, None, integrate=integrate) as sandbox: # Make copies from the sandbox into to the desired directory sandbox_root = sandbox.get_directory() -- cgit v1.2.1