From patchwork Mon Mar 7 12:18:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 4791 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 1F8C8C433EF for ; Mon, 7 Mar 2022 12:18:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.25760.1646655501665805080 for ; Mon, 07 Mar 2022 04:18:21 -0800 Authentication-Results: mx.groups.io; dkim=missing; 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 5DB6E1042 for ; Mon, 7 Mar 2022 04:18:21 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 07F5C3F73D for ; Mon, 7 Mar 2022 04:18:20 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH v2 2/2] python3-meh: use setuptools_legacy Date: Mon, 7 Mar 2022 12:18:18 +0000 Message-Id: <20220307121818.1851345-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220307121818.1851345-1-ross.burton@arm.com> References: <20220307121818.1851345-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 ; Mon, 07 Mar 2022 12:18:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95852 This setup.py installs data_files with absolute paths, which isn't supported by bdist_wheel. Use setuptools_legacy as the legacy install task needs to be used. Also update patch status on the setuptools port. Signed-off-by: Ross Burton --- ...etup.py-switch-from-distutils-to-setuptools.patch | 3 +-- .../python-meh/python3-meh_0.50.1.bb | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch b/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch index b616b3fad3..2eb6be5a18 100644 --- a/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch +++ b/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch @@ -9,8 +9,7 @@ In Python 3.10 'distutils' is deprecated with removal slated for Python This also allows for a 'wheel' binary archive format to be built with 'setup.py bdist_wheel'. -Upstream-Status: Submitted -[https://github.com/rhinstaller/python-meh/pull/37] +Upstream-Status: Backport [cf9eafdd165347f86bb4a2534c41fd805db52322] Signed-off-by: Tim Orling diff --git a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb index 9f72b72623..1d9af438da 100644 --- a/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb +++ b/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/rhinstaller/python-meh" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit setuptools3 +inherit setuptools3_legacy S = "${WORKDIR}/git" @@ -14,12 +14,4 @@ SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=rhe " SRCREV = "c321ce22950aff76611a3c6beffa02b5ea3adbed" -PIP_INSTALL_PACKAGE = "python_meh" - -do_install:append () { - install -d ${D}/${datadir}/python-meh - mv ${D}${PYTHON_SITEPACKAGES_DIR}${datadir}/python-meh/* ${D}/${datadir}/python-meh/ -} - -FILES:${PN} += "${datadir}/*" - +FILES:${PN} += "${datadir}/python-meh"