From: Heinrich Schuchardt Date: Sat, 9 Apr 2022 12:53:18 +0000 (+0200) Subject: binman: don't import deprecated distutils package X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=dd2e8ed41555b1f9e139c7be3a073885684670df;p=u-boot.git binman: don't import deprecated distutils package '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 AssertionError: 0 != 468 As we don't use Ubuntu 16.04 for our CI anymore drop the import. Signed-off-by: Heinrich Schuchardt Reviewed-by: Alper Nebi Yasak --- diff --git a/tools/binman/main.py b/tools/binman/main.py index 9392b59adb..5fb9404ef6 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