From patchwork Mon Mar 7 12:11:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 4786 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 EE157C433F5 for ; Mon, 7 Mar 2022 12:11:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.25479.1646655075925416752 for ; Mon, 07 Mar 2022 04:11:16 -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 F22C5ED1 for ; Mon, 7 Mar 2022 04:11:14 -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 98F053F73D for ; Mon, 7 Mar 2022 04:11:14 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 1/2] python3-blivetgui: use setuptools_legacy Date: Mon, 7 Mar 2022 12:11:11 +0000 Message-Id: <20220307121112.1844760-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.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 ; Mon, 07 Mar 2022 12:11:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95847 The setup.py installs to arbitrary target paths, so can't use the new bdist_wheel installation method. Signed-off-by: Ross Burton --- .../recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb index 995fb49622..7c3af1a8be 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protoc inherit features_check REQUIRED_DISTRO_FEATURES = "x11 systemd" -inherit setuptools3 python3native +inherit setuptools3_legacy python3native RDEPENDS:${PN} = "python3-pygobject python3 \ python3-blivet gtk+3 \ From patchwork Mon Mar 7 12:11:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 4787 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 EE2CBC433FE for ; Mon, 7 Mar 2022 12:11:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.25390.1646655076380527552 for ; Mon, 07 Mar 2022 04:11:16 -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 858161042 for ; Mon, 7 Mar 2022 04:11:15 -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 2E1D43F73D for ; Mon, 7 Mar 2022 04:11:15 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/2] python3-blivet: use setuptools_legacy Date: Mon, 7 Mar 2022 12:11:12 +0000 Message-Id: <20220307121112.1844760-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220307121112.1844760-1-ross.burton@arm.com> References: <20220307121112.1844760-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:11:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95848 The setup.py installs to arbitrary target paths, so can't use the new bdist_wheel installation method. Reverts daba6521f which was a sympton of the bad usage. Signed-off-by: Ross Burton --- .../python-blivet/python3-blivet_3.4.3.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb index fcadf130c9..bd57604f26 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb @@ -19,16 +19,10 @@ SRC_URI += "\ " SRC_URI[sha256sum] = "1b05b77f3ee35d82c7a577a168c9ba0204d3e9a87eb1975e5f9af47700eeff48" -inherit pypi features_check systemd setuptools3 +inherit pypi features_check systemd setuptools3_legacy REQUIRED_DISTRO_FEATURES = "systemd" -do_install:append() { - mv ${D}${PYTHON_SITEPACKAGES_DIR}${exec_prefix}/* ${D}${exec_prefix} - mv ${D}${PYTHON_SITEPACKAGES_DIR}${sysconfdir} ${D} - mv ${D}${PYTHON_SITEPACKAGES_DIR}${base_libdir} ${D} -} - RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ parted python3-pyparted multipath-tools \ lsof cryptsetup libblockdev \