diff options
Diffstat (limited to 'tools/buildman')
| -rw-r--r-- | tools/buildman/buildman.rst | 2 | ||||
| -rw-r--r-- | tools/buildman/test.py | 2 | ||||
| -rw-r--r-- | tools/buildman/toolchain.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/buildman/buildman.rst b/tools/buildman/buildman.rst index 924564b5700..07ecc5c110c 100644 --- a/tools/buildman/buildman.rst +++ b/tools/buildman/buildman.rst @@ -247,7 +247,7 @@ Setting up section is ignored. If more than one line is provided, only the last one is taken. -#. Make sure you have the require Python pre-requisites +#. Make sure you have the required Python pre-requisites Buildman uses multiprocessing, Queue, shutil, StringIO, ConfigParser and urllib2. These should normally be available, but if you get an error like diff --git a/tools/buildman/test.py b/tools/buildman/test.py index c5feb74a105..e31e6c72e1a 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -987,7 +987,7 @@ class TestBuild(unittest.TestCase): diff = self.call_make_environment(tchn, full_path=True)[0] self.assertEqual({b'LC_ALL': b'C'}, diff) - # Test that virtualenv is handled correctly + # Test that Python sandbox is handled correctly tchn.override_toolchain = False sys.prefix = '/some/venv' env = dict(os.environb) diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 5d051e005da..5e5bb4b0aed 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -217,7 +217,7 @@ class Toolchain: elif self.cross: env[b'CROSS_COMPILE'] = tools.to_bytes(wrapper + self.cross) - # Detect a Python virtualenv and avoid defeating it + # Detect a Python sandbox and avoid defeating it if sys.prefix != sys.base_prefix: paths = env[b'PATH'].split(b':') new_paths = [] @@ -531,7 +531,7 @@ class Toolchains: if arch == 'aarch64': arch = 'arm64' base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['13.2.0', '12.2.0'] + versions = ['14.2.0', '13.2.0'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version) |