From acf751be2be4576499a6b730079fffb09c2be1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Tue, 11 Feb 2020 19:08:20 +0100 Subject: linux.py: Drop bwrap support --- src/buildstream/_platform/linux.py | 26 -------------------------- 1 file changed, 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 -- cgit v1.2.1