From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cQJmy4jLfz34JS for ; Mon, 15 Sep 2025 08:56:50 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cQJmv1RwXz32Yl for ; Mon, 15 Sep 2025 08:56:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4cQJmr5vQlz5n; Mon, 15 Sep 2025 08:56:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757926605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ESyiXLEcrY6EPN2uCJYkrGRx/h9bxqos4QR770CFnSY=; b=wYoi+7hPyJu7dKEeS2fLEdONephQHoJ7dXoNZBeFhFZWJEPLBCclZ37VdXDyGjw+x4jx/X T8MpNkKOzN1mULBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757926605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ESyiXLEcrY6EPN2uCJYkrGRx/h9bxqos4QR770CFnSY=; b=adk8Inu46AfZEgPf0ctOVBLMT5L7m4NTYT6ijp78juPpmM1UfHjIJOBjKTAn0HUUFtagaR NjNZtYhhszNr+SN+Syxe6vrjwklI9weZpiDr0Fd7q2LIGfNwoaUesQZwvmFL0tAkTpUqvi drt2k/HLnLjdDH1LVPCKD7hlAxba22WeGETLXg5as3sbcxPiTZgjK0t7LeTRsmC/bsCpWz /j7X1MBxg97Ta6P8mcPeS31K47RkZ/+SA1ma5YehSrQopQrdCeyi+LE7QdNchm6ZqQzPB9 qzqAdK9oy3NgD4YlZIEav91C+YaXtRKMz2uJWL5L0FFd/T4EMr/D5Ukn52XvVw== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 1/8] python3: Remove bundled setuptools Date: Mon, 15 Sep 2025 10:56:33 +0200 Message-ID: <20250915085640.3157-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit - python3-pillow was finding the bundled setuptools version 63.2.0 and not the installed version of 80.9.0 and the bundled version failed the pillow requirement of >=77 - The bundled version install can not be disabled so this patch removes all the setuptools directories at the end of the python3 install so that only the IPFire installed version of setuptools will be available. - This resolved the problem of python3-pillow failing to build - The bundled setuptools has been removed in python-3.12 so when that version is released in IPFire the removal lines added in this patch will be able to be removed. - The removal of the bundled version of setuptools also caused changes in the rootfiles of 6 other python modules, so it looks like those were also building with the older bundled version but had no version requirement failure. This patch set also includes the changed rootfiles for each of those packages. Signed-off-by: Adolf Belka --- config/rootfiles/common/python3 | 216 -------------------------------- lfs/python3 | 3 + 2 files changed, 3 insertions(+), 216 deletions(-) diff --git a/config/rootfiles/common/python3 b/config/rootfiles/common/python3 index d3bdc1c48..970cc57cd 100644 --- a/config/rootfiles/common/python3 +++ b/config/rootfiles/common/python3 @@ -1688,222 +1688,6 @@ usr/lib/python3.10/site-packages/pkg_resources/_vendor/pyparsing/util.py usr/lib/python3.10/site-packages/pkg_resources/_vendor/zipp.py usr/lib/python3.10/site-packages/pkg_resources/extern usr/lib/python3.10/site-packages/pkg_resources/extern/__init__.py -#usr/lib/python3.10/site-packages/setuptools -#usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/INSTALLER -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/LICENSE -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/METADATA -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/RECORD -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/REQUESTED -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/WHEEL -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/entry_points.txt -usr/lib/python3.10/site-packages/setuptools-63.2.0.dist-info/top_level.txt -usr/lib/python3.10/site-packages/setuptools/__init__.py -usr/lib/python3.10/site-packages/setuptools/_deprecation_warning.py -usr/lib/python3.10/site-packages/setuptools/_distutils -usr/lib/python3.10/site-packages/setuptools/_distutils/__init__.py -usr/lib/python3.10/site-packages/setuptools/_distutils/_collections.py -usr/lib/python3.10/site-packages/setuptools/_distutils/_functools.py -usr/lib/python3.10/site-packages/setuptools/_distutils/_macos_compat.py -usr/lib/python3.10/site-packages/setuptools/_distutils/_msvccompiler.py -usr/lib/python3.10/site-packages/setuptools/_distutils/archive_util.py -usr/lib/python3.10/site-packages/setuptools/_distutils/bcppcompiler.py -usr/lib/python3.10/site-packages/setuptools/_distutils/ccompiler.py -usr/lib/python3.10/site-packages/setuptools/_distutils/cmd.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command -usr/lib/python3.10/site-packages/setuptools/_distutils/command/__init__.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/_framework_compat.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/bdist.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/bdist_dumb.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/bdist_msi.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/bdist_rpm.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/bdist_wininst.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/build.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/build_clib.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/build_ext.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/build_py.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/build_scripts.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/check.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/clean.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/config.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/install.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/install_data.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/install_egg_info.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/install_headers.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/install_lib.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/install_scripts.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/py37compat.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/register.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/sdist.py -usr/lib/python3.10/site-packages/setuptools/_distutils/command/upload.py -usr/lib/python3.10/site-packages/setuptools/_distutils/config.py -usr/lib/python3.10/site-packages/setuptools/_distutils/core.py -usr/lib/python3.10/site-packages/setuptools/_distutils/cygwinccompiler.py -usr/lib/python3.10/site-packages/setuptools/_distutils/debug.py -usr/lib/python3.10/site-packages/setuptools/_distutils/dep_util.py -usr/lib/python3.10/site-packages/setuptools/_distutils/dir_util.py -usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py -usr/lib/python3.10/site-packages/setuptools/_distutils/errors.py -usr/lib/python3.10/site-packages/setuptools/_distutils/extension.py -usr/lib/python3.10/site-packages/setuptools/_distutils/fancy_getopt.py -usr/lib/python3.10/site-packages/setuptools/_distutils/file_util.py -usr/lib/python3.10/site-packages/setuptools/_distutils/filelist.py -usr/lib/python3.10/site-packages/setuptools/_distutils/log.py -usr/lib/python3.10/site-packages/setuptools/_distutils/msvc9compiler.py -usr/lib/python3.10/site-packages/setuptools/_distutils/msvccompiler.py -usr/lib/python3.10/site-packages/setuptools/_distutils/py38compat.py -usr/lib/python3.10/site-packages/setuptools/_distutils/py39compat.py -usr/lib/python3.10/site-packages/setuptools/_distutils/spawn.py -usr/lib/python3.10/site-packages/setuptools/_distutils/sysconfig.py -usr/lib/python3.10/site-packages/setuptools/_distutils/text_file.py -usr/lib/python3.10/site-packages/setuptools/_distutils/unixccompiler.py -usr/lib/python3.10/site-packages/setuptools/_distutils/util.py -usr/lib/python3.10/site-packages/setuptools/_distutils/version.py -usr/lib/python3.10/site-packages/setuptools/_distutils/versionpredicate.py -usr/lib/python3.10/site-packages/setuptools/_entry_points.py -usr/lib/python3.10/site-packages/setuptools/_imp.py -usr/lib/python3.10/site-packages/setuptools/_importlib.py -usr/lib/python3.10/site-packages/setuptools/_itertools.py -usr/lib/python3.10/site-packages/setuptools/_path.py -usr/lib/python3.10/site-packages/setuptools/_reqs.py -#usr/lib/python3.10/site-packages/setuptools/_vendor -usr/lib/python3.10/site-packages/setuptools/_vendor/__init__.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/_adapters.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/_collections.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/_compat.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/_functools.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/_itertools.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/_meta.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_metadata/_text.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/_adapters.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/_common.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/_compat.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/_itertools.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/_legacy.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/abc.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/readers.py -usr/lib/python3.10/site-packages/setuptools/_vendor/importlib_resources/simple.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/jaraco -usr/lib/python3.10/site-packages/setuptools/_vendor/jaraco/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/jaraco/context.py -usr/lib/python3.10/site-packages/setuptools/_vendor/jaraco/functools.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/jaraco/text -usr/lib/python3.10/site-packages/setuptools/_vendor/jaraco/text/__init__.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/more_itertools -usr/lib/python3.10/site-packages/setuptools/_vendor/more_itertools/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/more_itertools/more.py -usr/lib/python3.10/site-packages/setuptools/_vendor/more_itertools/recipes.py -usr/lib/python3.10/site-packages/setuptools/_vendor/ordered_set.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/packaging -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/__about__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/_manylinux.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/_musllinux.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/_structures.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/markers.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/requirements.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/specifiers.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/tags.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/utils.py -usr/lib/python3.10/site-packages/setuptools/_vendor/packaging/version.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/actions.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/common.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/core.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/diagram -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/diagram/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/exceptions.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/helpers.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/results.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/testing.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/unicode.py -usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/util.py -#usr/lib/python3.10/site-packages/setuptools/_vendor/tomli -usr/lib/python3.10/site-packages/setuptools/_vendor/tomli/__init__.py -usr/lib/python3.10/site-packages/setuptools/_vendor/tomli/_parser.py -usr/lib/python3.10/site-packages/setuptools/_vendor/tomli/_re.py -usr/lib/python3.10/site-packages/setuptools/_vendor/tomli/_types.py -usr/lib/python3.10/site-packages/setuptools/_vendor/typing_extensions.py -usr/lib/python3.10/site-packages/setuptools/_vendor/zipp.py -usr/lib/python3.10/site-packages/setuptools/archive_util.py -usr/lib/python3.10/site-packages/setuptools/build_meta.py -usr/lib/python3.10/site-packages/setuptools/cli-32.exe -usr/lib/python3.10/site-packages/setuptools/cli-64.exe -usr/lib/python3.10/site-packages/setuptools/cli-arm64.exe -usr/lib/python3.10/site-packages/setuptools/cli.exe -#usr/lib/python3.10/site-packages/setuptools/command -usr/lib/python3.10/site-packages/setuptools/command/__init__.py -usr/lib/python3.10/site-packages/setuptools/command/alias.py -usr/lib/python3.10/site-packages/setuptools/command/bdist_egg.py -usr/lib/python3.10/site-packages/setuptools/command/bdist_rpm.py -usr/lib/python3.10/site-packages/setuptools/command/build.py -usr/lib/python3.10/site-packages/setuptools/command/build_clib.py -usr/lib/python3.10/site-packages/setuptools/command/build_ext.py -usr/lib/python3.10/site-packages/setuptools/command/build_py.py -usr/lib/python3.10/site-packages/setuptools/command/develop.py -usr/lib/python3.10/site-packages/setuptools/command/dist_info.py -usr/lib/python3.10/site-packages/setuptools/command/easy_install.py -usr/lib/python3.10/site-packages/setuptools/command/egg_info.py -usr/lib/python3.10/site-packages/setuptools/command/install.py -usr/lib/python3.10/site-packages/setuptools/command/install_egg_info.py -usr/lib/python3.10/site-packages/setuptools/command/install_lib.py -usr/lib/python3.10/site-packages/setuptools/command/install_scripts.py -usr/lib/python3.10/site-packages/setuptools/command/launcher manifest.xml -usr/lib/python3.10/site-packages/setuptools/command/py36compat.py -usr/lib/python3.10/site-packages/setuptools/command/register.py -usr/lib/python3.10/site-packages/setuptools/command/rotate.py -usr/lib/python3.10/site-packages/setuptools/command/saveopts.py -usr/lib/python3.10/site-packages/setuptools/command/sdist.py -usr/lib/python3.10/site-packages/setuptools/command/setopt.py -usr/lib/python3.10/site-packages/setuptools/command/test.py -usr/lib/python3.10/site-packages/setuptools/command/upload.py -usr/lib/python3.10/site-packages/setuptools/command/upload_docs.py -#usr/lib/python3.10/site-packages/setuptools/config -usr/lib/python3.10/site-packages/setuptools/config/__init__.py -usr/lib/python3.10/site-packages/setuptools/config/_apply_pyprojecttoml.py -usr/lib/python3.10/site-packages/setuptools/config/_validate_pyproject -usr/lib/python3.10/site-packages/setuptools/config/_validate_pyproject/__init__.py -usr/lib/python3.10/site-packages/setuptools/config/_validate_pyproject/error_reporting.py -usr/lib/python3.10/site-packages/setuptools/config/_validate_pyproject/extra_validations.py -#usr/lib/python3.10/site-packages/setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py -#usr/lib/python3.10/site-packages/setuptools/config/_validate_pyproject/fastjsonschema_validations.py -usr/lib/python3.10/site-packages/setuptools/config/_validate_pyproject/formats.py -usr/lib/python3.10/site-packages/setuptools/config/expand.py -usr/lib/python3.10/site-packages/setuptools/config/pyprojecttoml.py -usr/lib/python3.10/site-packages/setuptools/config/setupcfg.py -usr/lib/python3.10/site-packages/setuptools/dep_util.py -usr/lib/python3.10/site-packages/setuptools/depends.py -usr/lib/python3.10/site-packages/setuptools/discovery.py -usr/lib/python3.10/site-packages/setuptools/dist.py -usr/lib/python3.10/site-packages/setuptools/errors.py -usr/lib/python3.10/site-packages/setuptools/extension.py -usr/lib/python3.10/site-packages/setuptools/extern -usr/lib/python3.10/site-packages/setuptools/extern/__init__.py -usr/lib/python3.10/site-packages/setuptools/glob.py -usr/lib/python3.10/site-packages/setuptools/gui-32.exe -usr/lib/python3.10/site-packages/setuptools/gui-64.exe -usr/lib/python3.10/site-packages/setuptools/gui-arm64.exe -usr/lib/python3.10/site-packages/setuptools/gui.exe -usr/lib/python3.10/site-packages/setuptools/installer.py -usr/lib/python3.10/site-packages/setuptools/launch.py -usr/lib/python3.10/site-packages/setuptools/logging.py -usr/lib/python3.10/site-packages/setuptools/monkey.py -usr/lib/python3.10/site-packages/setuptools/msvc.py -usr/lib/python3.10/site-packages/setuptools/namespaces.py -usr/lib/python3.10/site-packages/setuptools/package_index.py -usr/lib/python3.10/site-packages/setuptools/py34compat.py -usr/lib/python3.10/site-packages/setuptools/sandbox.py -usr/lib/python3.10/site-packages/setuptools/script (dev).tmpl -usr/lib/python3.10/site-packages/setuptools/script.tmpl -usr/lib/python3.10/site-packages/setuptools/unicode_utils.py -usr/lib/python3.10/site-packages/setuptools/version.py -usr/lib/python3.10/site-packages/setuptools/wheel.py -usr/lib/python3.10/site-packages/setuptools/windows_support.py usr/lib/python3.10/site.py usr/lib/python3.10/smtpd.py usr/lib/python3.10/smtplib.py diff --git a/lfs/python3 b/lfs/python3 index fe488cc13..4e5afa285 100644 --- a/lfs/python3 +++ b/lfs/python3 @@ -112,5 +112,8 @@ else cd /usr/lib/python3.10 && find . | grep -E "(/test/)" | xargs rm -rf endif + # Remove the bundled setuptools directories + cd /usr/lib/python3.10/site-packages/ && rm -r setuptools* + @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.51.0