From patchwork Wed Nov 20 19:51:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52834 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6A01D743CF for ; Wed, 20 Nov 2024 19:51:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.24286.1732132290328297088 for ; Wed, 20 Nov 2024 11:51:30 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AFCED12FC for ; Wed, 20 Nov 2024 11:51:59 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 492AB3F66E for ; Wed, 20 Nov 2024 11:51:29 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/2] classes-recipe/python_pep517: remove all RECORDS files Date: Wed, 20 Nov 2024 19:51:23 +0000 Message-Id: <20241120195124.1041875-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 19:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207479 Python modules install metadata into a .dist-info directory, one of which is RECORD, which contains the files that were installed and their checksum[1]. This is typically used by pip to validate the install, or to know what files to remove when the module is uninstalled. This is slightly problematic when we need to do patching of installed .py files in do_install(), as the RECORD file has already been written at that point. However, the RECORD files only really have a use outside of a system- managed environment, which our python packages are. We already have commands to verify and remove modules (opkg, dpkg, rpm) and the RECORD file existing simply allows people to 'sudo pip' and alter the package- managed directories outside of the package manager. This is not a good idea, and some other distros remove the RECORD file to stop this possibility: - Debian[2] - Fedora[3] - Gentoo[4] We can follow for all packages which inherit python_pep517, which is the majority of the Python packages now. [1] https://peps.python.org/pep-0491/#the-dist-info-directory [2] https://salsa.debian.org/python-team/tools/dh-python/-/blob/master/dhpython/fs.py?ref_type=heads#L185 [3] https://src.fedoraproject.org/rpms/pyproject-rpm-macros/blob/rawhide/f/macros.pyproject#_105 [4] https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c49f3c00415dee99407dabba8d3b22895c9d25 Signed-off-by: Ross Burton Reviewed-by: Tim Orling --- meta/classes-recipe/python_pep517.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes-recipe/python_pep517.bbclass b/meta/classes-recipe/python_pep517.bbclass index c30674c8ec8..e8cd1923ef2 100644 --- a/meta/classes-recipe/python_pep517.bbclass +++ b/meta/classes-recipe/python_pep517.bbclass @@ -50,6 +50,8 @@ python_pep517_do_install () { fi nativepython3 -m installer ${INSTALL_WHEEL_COMPILE_BYTECODE} --interpreter "${USRBINPATH}/env ${PEP517_INSTALL_PYTHON}" --destdir=${D} ${PEP517_WHEEL_PATH}/*.whl + + find ${D} -path *.dist-info/RECORD -delete } # A manual do_install that just uses unzip for bootstrapping purposes. Callers should DEPEND on unzip-native. From patchwork Wed Nov 20 19:51:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52835 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7999D743D0 for ; Wed, 20 Nov 2024 19:51:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.24287.1732132290897749997 for ; Wed, 20 Nov 2024 11:51:31 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7612B1480 for ; Wed, 20 Nov 2024 11:52:00 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 09B173F66E for ; Wed, 20 Nov 2024 11:51:29 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/2] python3-cryptography-vectors: don't remove RECORD Date: Wed, 20 Nov 2024 19:51:24 +0000 Message-Id: <20241120195124.1041875-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241120195124.1041875-1-ross.burton@arm.com> References: <20241120195124.1041875-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Nov 2024 19:51:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/207480 We remove this file in the python_pep517 class now, so we don't need to do it here. Signed-off-by: Ross Burton --- .../python/python3-cryptography-vectors_43.0.1.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb index a1a10b7621b..1ad9a8ab867 100644 --- a/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb +++ b/meta/recipes-devtools/python/python3-cryptography-vectors_43.0.1.bb @@ -19,11 +19,6 @@ DEPENDS += " \ python3-cryptography \ " -do_install:append () { - # Remove the sha256 checksum lines for pycache files - sed ${D}${PYTHON_SITEPACKAGES_DIR}/cryptography_vectors-${PV}.dist-info/RECORD -e '/__pycache__/d' -i -} - BBCLASSEXTEND = "native nativesdk" UPSTREAM_CHECK_REGEX = ""