From patchwork Tue Mar 1 14:05:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 4521 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 47778C433F5 for ; Tue, 1 Mar 2022 14:05:09 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.8358.1646143507958341144 for ; Tue, 01 Mar 2022 06:05:08 -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 57DE2106F for ; Tue, 1 Mar 2022 06:05:07 -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 03AC63F70D for ; Tue, 1 Mar 2022 06:05:06 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] CI: fix python3-dtc installation Date: Tue, 1 Mar 2022 14:05:04 +0000 Message-Id: <20220301140504.1785064-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220301140504.1785064-1-ross.burton@arm.com> References: <20220301140504.1785064-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 ; Tue, 01 Mar 2022 14:05:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3081 --- 0001-python3-dtc-fix-wheel-build.patch | 40 +++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/0001-python3-dtc-fix-wheel-build.patch b/0001-python3-dtc-fix-wheel-build.patch index ca45c91f..92032190 100644 --- a/0001-python3-dtc-fix-wheel-build.patch +++ b/0001-python3-dtc-fix-wheel-build.patch @@ -1,7 +1,7 @@ From ef0d9470c853ee8bbef33db4708d3657646ad8f8 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sun, 27 Feb 2022 15:28:17 -0800 -Subject: [PATCH] python3-dtc: fix wheel build +Subject: [PATCH 1/2] python3-dtc: fix wheel build The wheel that is built is ${S}/dist/libfdt-1.6.2.dev39+g4048aed.d20220103-cp310-cp310-linux_x86_64.whl Set PYPA_WHEEL to match this. @@ -18,12 +18,44 @@ index 449d071..671d280 100644 @@ -19,6 +19,8 @@ SRCREV = "4048aed12b81c5a0154b9af438edc99ec7d2b6a1" PV = "1.6.1+git${SRCPV}" S = "${WORKDIR}/git" - + +PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl" + inherit setuptools3 pkgconfig - + BBCLASSEXTEND = "native nativesdk" --- +-- 2.25.1 + +From 07ea5e0d41350f2bbee3c0a1498f5e42dec66e35 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 1 Mar 2022 11:50:37 +0000 +Subject: [PATCH 2/2] python3-dtc: fix missing files in sysroot + +There is a bug in SWIG/setuptools where 'pip install' doesn't build +libfdt.py unless the build tree is already dirty, which makes using +the library impossible. + +Bump the SRCREV to incorporate the upstream workaround for this issue. + +Signed-off-by: Ross Burton +--- + recipes-kernel/dtc/python3-dtc_1.6.1.bb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/recipes-kernel/dtc/python3-dtc_1.6.1.bb +index 671d280..a868bd0 100644 +--- a/recipes-kernel/dtc/python3-dtc_1.6.1.bb ++++ b/recipes-kernel/dtc/python3-dtc_1.6.1.bb +@@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + + LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c974174a29108c8d80b5dce90" + +-SRCREV = "4048aed12b81c5a0154b9af438edc99ec7d2b6a1" ++SRCREV = "c001fc01a43e7a06447c06ea3d50bd60641322b8" + + PV = "1.6.1+git${SRCPV}" + S = "${WORKDIR}/git" +-- +2.25.1