aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2022-04-09 14:53:18 +0200
committerTom Rini <trini@konsulko.com>2022-04-25 10:11:05 -0400
commitdd2e8ed41555b1f9e139c7be3a073885684670df (patch)
tree0a3929150447d090da2d02ca70cb865135058fb3 /tools
parent06c73e37b329f6cc564b766cc739dff3c909e8c9 (diff)
downloadu-boot-dd2e8ed41555b1f9e139c7be3a073885684670df.zip
u-boot-dd2e8ed41555b1f9e139c7be3a073885684670df.tar.gz
u-boot-dd2e8ed41555b1f9e139c7be3a073885684670df.tar.bz2
binman: don't import deprecated distutils packageCI/2022-04-23-binman-updates
'make tests' fails on Ubuntu 22.04 with: binman: ./tools/binman/binman:12: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives from distutils.sysconfig import get_python_lib ./tools/binman/binman:12: DeprecationWarning: The distutils.sysconfig module is deprecated, use sysconfig instead from distutils.sysconfig import get_python_lib <unittest.result.TestResult run=428 errors=0 failures=4> AssertionError: 0 != 468 As we don't use Ubuntu 16.04 for our CI anymore drop the import. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/binman/main.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/binman/main.py b/tools/binman/main.py
index 9392b59..5fb9404 100755
--- a/tools/binman/main.py
+++ b/tools/binman/main.py
@@ -9,7 +9,6 @@
"""See README for more information"""
-from distutils.sysconfig import get_python_lib
import os
import site
import sys
@@ -44,12 +43,6 @@ sys.path.insert(2, os.path.join(srctree, 'scripts/dtc/pylibfdt'))
sys.path.insert(2, os.path.join(srctree, 'build-sandbox/scripts/dtc/pylibfdt'))
sys.path.insert(2, os.path.join(srctree, 'build-sandbox_spl/scripts/dtc/pylibfdt'))
-# When running under python-coverage on Ubuntu 16.04, the dist-packages
-# directories are dropped from the python path. Add them in so that we can find
-# the elffile module. We could use site.getsitepackages() here but unfortunately
-# that is not available in a virtualenv.
-sys.path.append(get_python_lib())
-
from binman import cmdline
from binman import control
from patman import test_util