From 929a491f4073d600cd95be4cf97d53faa9a6e38e Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 31 May 2024 19:17:33 -0600 Subject: [PATCH] utils/genrandconfig: drop glibc Linaro toolchain version check It has been well over 10 years since glibc 2.14 was released; the last Debian version that had an earlier glibc was Wheezy, which Freexian stopped to maintain as an ELTS in June 2020, 4 years ago, while the oldest still maintained Ubuntu has glibc 2.21. It is now safe to assume glibc 2.14 on all major, relevant distributions nowadays. The distutils module is no longer bundled with python 3.12 so this eliminates the need to install additional python modules under python 3.12. Signed-off-by: James Hilliard [yann.morin.1998@free.fr: add Debian and Ubuntu references] Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index b838dda34d..0889be0d43 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -25,8 +25,6 @@ import os from random import randint import sys import traceback -from distutils.version import StrictVersion -import platform class SystemInfo: @@ -166,23 +164,6 @@ async def is_toolchain_usable(configfile, config): print(" Missing: %s" % toolchainline.strip(), file=sys.stderr) return False - # The latest Linaro toolchains on x86-64 hosts requires glibc - # 2.14+ on the host. - if platform.machine() == 'x86_64': - if 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ - 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - proc = await asyncio.create_subprocess_exec( - 'ldd', '--version', stdout=asyncio.subprocess.PIPE) - ldd_version_output, _ = await proc.communicate() - if proc.returncode: - return False - glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] - if StrictVersion('2.14') > StrictVersion(glibc_version): - print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) - return False - return True