From patchwork Mon Apr 14 08:27:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changqing Li X-Patchwork-Id: 61261 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 662EEC369B2 for ; Mon, 14 Apr 2025 08:27:31 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.45056.1744619242238871004 for ; Mon, 14 Apr 2025 01:27:22 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=61995c6f5e=changqing.li@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53E4oEH9004452 for ; Mon, 14 Apr 2025 08:27:21 GMT Received: from ala-exchng01.corp.ad.wrs.com (ala-exchng01.wrs.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45yf58hr5x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 14 Apr 2025 08:27:21 +0000 (GMT) Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.43; Mon, 14 Apr 2025 01:27:20 -0700 Received: from pek-lpg-core6.wrs.com (147.11.136.210) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2507.43 via Frontend Transport; Mon, 14 Apr 2025 01:27:19 -0700 From: To: Subject: [PATCH 2/6] python3-pyyaml-include: update SRCREV Date: Mon, 14 Apr 2025 16:27:13 +0800 Message-ID: <20250414082717.2827252-2-changqing.li@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250414082717.2827252-1-changqing.li@windriver.com> References: <20250414082717.2827252-1-changqing.li@windriver.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=UPPdHDfy c=1 sm=1 tr=0 ts=67fcc6e9 cx=c_pps a=/ZJR302f846pc/tyiSlYyQ==:117 a=/ZJR302f846pc/tyiSlYyQ==:17 a=XR8D0OoHHMoA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=ct6YQbgXttWGSB3o_PYA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: fac-jvvczNoP7-b37BbcG3dL_Oi7xUx7 X-Proofpoint-ORIG-GUID: fac-jvvczNoP7-b37BbcG3dL_Oi7xUx7 X-Sensitive_Customer_Information: Yes X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-14_02,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 clxscore=1015 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504140060 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, 14 Apr 2025 08:27:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/116846 From: Changqing Li * Current SRCREV is v2.2a1, update to v2.2 * pyyaml-include use setuptools_scm to get package version, but it not works well with git shallow clone, and will return a invalid version like 0.1.dev1+gc5be2b7, make pyyaml-include is installed to a wrong path: /usr/lib/python3.13/site-packages/pyyaml_include-0.1.dev1+gc5be2b7.dist-info, and also version in PKG-INFO is wrong. export SETUPTOOLS_SCM_PRETEND_VERSION to get correct package version. Signed-off-by: Changqing Li --- .../recipes-devtools/python/python3-pyyaml-include_2.2.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include_2.2.bb b/meta-python/recipes-devtools/python/python3-pyyaml-include_2.2.bb index 49e643c710..5a3b2f0ab2 100644 --- a/meta-python/recipes-devtools/python/python3-pyyaml-include_2.2.bb +++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/tanbro/pyyaml-include" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" DEPENDS += "python3-setuptools-scm-native" -SRCREV = "c5be2b7dfc4aaa91e44dbeb6fa42adc80936ef9d" +SRCREV = "3e0db562a7b03fa1bf5cbe392c47658042596dd0" SRC_URI = " \ git://github.com/tanbro/pyyaml-include;protocol=https;branch=main \ @@ -13,6 +13,10 @@ S = "${WORKDIR}/git" inherit python_setuptools_build_meta ptest-python-pytest +do_compile:prepend() { + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +} + RDEPENDS:${PN} += " \ python3-pyyaml \ python3-fsspec \