diff options
| author | Jürg Billeter <j@bitron.ch> | 2020-02-11 19:08:20 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2020-06-03 13:49:39 +0200 |
| commit | acf751be2be4576499a6b730079fffb09c2be1d8 (patch) | |
| tree | d933a7d2b1754fd20a83cac8c522b18e502f9e58 | |
| parent | 93981f2784749639676e155cf7b9cccea03b3f0c (diff) | |
| download | buildstream-acf751be2be4576499a6b730079fffb09c2be1d8.tar.gz | |
linux.py: Drop bwrap support
| -rw-r--r-- | src/buildstream/_platform/linux.py | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/buildstream/_platform/linux.py b/src/buildstream/_platform/linux.py index 74d0e1227..1c9ba25b9 100644 --- a/src/buildstream/_platform/linux.py +++ b/src/buildstream/_platform/linux.py @@ -29,7 +29,6 @@ from .platform import Platform class Linux(Platform): def _setup_sandbox(self, force_sandbox): sandbox_setups = { - "bwrap": self._setup_bwrap_sandbox, "buildbox-run": self.setup_buildboxrun_sandbox, "dummy": self._setup_dummy_sandbox, } @@ -81,28 +80,3 @@ class Linux(Platform): self.check_sandbox_config = Linux._check_dummy_sandbox_config self.create_sandbox = self._create_dummy_sandbox return True - - # Bubble-wrap sandbox methods - def _check_sandbox_config_bwrap(self, config): - from ..sandbox._sandboxbwrap import SandboxBwrap - - SandboxBwrap.check_sandbox_config(self, config) - - def _create_bwrap_sandbox(self, *args, **kwargs): - from ..sandbox._sandboxbwrap import SandboxBwrap - - kwargs["linux32"] = self.linux32 - return SandboxBwrap(*args, **kwargs) - - def _setup_bwrap_sandbox(self): - from ..sandbox._sandboxbwrap import SandboxBwrap - - # This function should only be called once. - # but if it does eg, in the tests we want to - # reset the sandbox checks - - SandboxBwrap._have_good_bwrap = None - self._check_sandbox(SandboxBwrap) - self.check_sandbox_config = self._check_sandbox_config_bwrap - self.create_sandbox = self._create_bwrap_sandbox - return True |