From patchwork Thu Apr 17 02:55:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 61456 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 44CEFC369C2 for ; Thu, 17 Apr 2025 02:55:54 +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.197.1744858546541868262 for ; Wed, 16 Apr 2025 19:55:46 -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=6202e9a415=yi.zhao@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 53H15Nfx017842 for ; Thu, 17 Apr 2025 02:55:45 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2047.outbound.protection.outlook.com [104.47.55.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 461u2m9ynp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Apr 2025 02:55:45 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qMiyMvmYdjfrGwNRd27V9F7KtaMB+CR/DwBVGZ5Z8rZjPG2Mu1oTLWe+ycLihIH6Mcf8qJ4xsmPKg86NzK74Ay+bDouRRgrRSTRKDhxNkomNjgAAZ9hXQXYfikif6DOnMjrXOC5pVIEl+3DHJlhJ7e54StFK+jSX0RZ0g0qi9XWp6G0z9upB2mgXHpfOhzaN6yyzY7vAdycQlt86PBL8zsxamvwLMs1+wR124QMYpq7K6Amk7D6WXF5Lvd0+P0X6ixtXG8hVWz91HEQiSkigV915TQ/OxbMIhrHl/5t/HeZnkyfYn2zptNWpFQK1tDh9QiFvjdw//pQw0KrMepMnGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SfQfbYylvA/0XHwx28fPPHvRpsRIJHY9lFqSwtNBKTE=; b=Qc1BXcgAvmjkqtXiZg3NYYEblb0qH6WFvx3+2XcqjURREJFbXF4tmRFCG3MVMa5Ea0H70iGZT9SrLj/CtZVqo30Yz3Qlw5m+P2cxN1b5NAISjRcaMaWj3cE1106A/xnxaQAVsbvEktYeFhmdQ6y38vjhd+6sDqpQ2X98/WNveQqZTG4tRlQFLVQxqonln1uXv1pqop1ERTLxJxrwHgzXCmTZkvNIZSEQtOw+dl3KEZEUUHEwRlzx2eUyh7Ag9doD28+eC6AZdH+Gc4ZC8kQ2fRibDNZ39DDts7o2XY9lbiJUniFURwipXytSfZIb0oFhxoXz23jGo/0Pa+L28EfLyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Thu, 17 Apr 2025 02:55:42 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%4]) with mapi id 15.20.8632.035; Thu, 17 Apr 2025 02:55:42 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/7] python3-unittest-automake-output: fix version mismatch Date: Thu, 17 Apr 2025 10:55:26 +0800 Message-Id: <20250417025532.1363790-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCPR01CA0133.jpnprd01.prod.outlook.com (2603:1096:400:26d::14) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|IA0PR11MB7935:EE_ X-MS-Office365-Filtering-Correlation-Id: ecb33139-7771-486d-5f31-08dd7d5b5796 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: iDiZHdTk/JQ13n9p7ZLt0wUQ8qMNh+vzuV0I3Lv1+qhlm3ssPvyZbhRyPkUK4y5lc3FR4FlrO2wIFivUi116zbFWGjl4iKGxp4qS8iBCJQQsgv9hh/ozg07vgl2c4g88l3vcI1//OY674dmnNINmfn3DvBIucMI33+Sm/4lhrlETg0LrD0tb8jzz0s/ZDsyr775s7rI1V1gSN+M0IFZ45nDNvS65fFfOlLmBp1hqvNBiex2IizFXIxHFm0390Fs/navQ6wWw7i4GKO8/Zyj0hRpPcixB0R2lt7jD9fVMGRQXDbGzhdvidjGZt0Q3Wj02T/iC56i+DBqFzYQ16xlOGMcApHukzdLYzbY43tHvG5gQKmYq4WjrkA6ooe25+Tts4/p9Sl599eEBhwUh2UxYLkWCYpohlRvl8jjkj+zHqqDPqHKPEsottLyVQrEp40WNVIPvQ+DCDoL3NS5wMRxn+lLpNitWk6Xg35AuwBo/104OQnulZ5GxKmuZpUP9FE95eShLb/BctkpO/UnxYsyKZx76cDMNpotU7pwfjHYRGjWQ7IUFYQmwDvD1UCXbHppMutUjLSRv7yRHCD+TsZGhxF3grXTJ3eFL7A1hDUzXrP9lb1JfvPM+AKP34qGinNDnyKppVuhj9cCTh+J4rCWS09Grkm518kW6QXCnd8Cv18m5tjRaBG9HlQGi0lSQ8+z3P2v+PRmpQIQahTwfGhLnRNZEnYAainroimiKfO0TZ9TbShRG6t2n+W7B62jCsNVlnW5Mj+BbjpaR+WJFWkN/K2W3+HN0n6wmm0V9/AxlfbWQk7ul7uSYzrcPg54h70YtPqx4CY1HA6s/XbsQCTPKMeiYoSbZTnHpygyMpA4DieNR/PNiJ8SbZxTBhs3sKF6YExf1tskKOwkpAa5UQtpBMSfLNm3fK9DNaoFYqCEV1+ECCFk5AAwDdDh7Iof5Si5ear9JrT0KLyUlCXSPENRvz/KoGOk8gfQLKCBd7p6t7leDHjtxokMvg5Xgi+7kAR9KAFn8ybXQO3Qdk1bPCWNzD/zN5H5laUw1+ylo97rjP7xW13FkihD69YXRVVOo8EwxzzyuTuPSzAt2cH7vGP6e83MqXut3Orkf3NimaCi7mQnow8Hkx+yUjdREV2XFs1ZliL8E4im3tEjSOZRTq4+V7HYKIfpjM93l4uS8D51uVav7Y/yK5AWOgrQvBCjWtWqgL/nadqisfrc2hmM83p0gh0Um1ugiYePEIXtqm8aqa3msUVfOwvozf3gOZcTJfoFhKFHMJWlXbnLnMH+FY6hm2Lnhotqgc765y1mLuKXTwurkUYDxv8F3wvtRU1ZgnLJWKSzFWuq2bKbdwFxWg+P8lb3RNQvmpbdYSRDSAo7Cn/aTzIs97K3k88r5J6wI2sIrZYe4Zi60yeQ+8bauC4vUktD7ZgkX6SQKs5nR8Mz+TskE0CEE859kNr6uh3UxDHEm X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dBpOhuB89GNtBhkeYFMzou4M23UDHn5qvA8czveBjD1+dqypZgvRBqKVtbhe2svNBuadVwnDIueX6GIjhKNGBOY4t8ljBmROgKga2eaMALHuvfBUY6Zlfo+IBE9/LzLk6hRoQyKaDh/IhZmmHnmJRiq0CNByCxNaPPv8sH8gUQOoYR++CGAp0YV4R98zDX8oC0hcGxT5QYjOBGBVeywVAstI6J2CTCnBiulY49LZe9RHVb74n4Se1ByPIsnr/iWNyyiore+3xXiGuYkW0rQnBSBgOF/8hZbbEnGP88l3QJkFUbLZDql4CMj+V1iMwvHWCywP4c6nWU8ZfvkVvlZWilimjzSHsVo+xHgwXO8gTZWqgt5u8LBiWz9KI7MalqYMOVVY04EzfUi+Fw43Qp/s78m2U4QQMdBlRqMRk2VzOHvWxGZdRW2a5wktJy4BAOYe6JUwDk1MLVimE3NfDmeTktvwnu44DxmDUR4iSYKSz7NIwDH1IIcGF9Q6AuL7RWMgfDoP2fJ2oqAJaHYP6ko+1utd9yBiuVWEgOIzNDLfqby8hlxBmuX2qRaIjnaN3OsRMzY6I1GwtfLPu+2x1wM4St/OY5rrtvMvAjHvUQQSPmJlCrlJ9hYyVPcAvMsDSuhQIKbAuPXGpYaEhc2sQmLBjTl1eOfOyetsSFUclIhvP+8cHoyNjB6Yjf64RL/fEb47BGhVXlh1lnlSe9MQkzN2GQD28FvPRypn7qXFgfzRmx161golwA5ZEIgjWNrncrAnJkmod7bZc/m5EhI2ILLUyXXPkEuSZJNFwFqM06Bo5SQodTXGCqlnjcAKvILEsDplBGv7v6+PB8glvJf/SQwkM7/WXnqK85bpZRZe8dpYJmcO7B2CTkbckE42ti6wIXE2+n+SmcJO10FrTXNVH6dIaqRiQTIoSUPH7YS5IvQtmW0r7+W2fo7R7wavzeInbGyFEscFXQ7hlbW+PhX9y7Qn9OIEEfh/S/FFvVkrebnROGbg9p5n6aPW+oDkArJN6znNzMG1MKNWiGogywPrkFCK2TMPHKGcwfcQaT0YBknm2CghItdVTmdjYWHYQEgIZm31kePP7zG0XvEsZ6bS9G/byhNYfTYBH6g/DYZj55nQsxKEStTcYO5WvSCzgPHd2SqGS1mphK9O6lIJyMcJU7A2YLWH8ep/gxN8MZHSqmuGS3RnOZ4JNLHDCXLveBBxBVnfpakJPUWzoevjqqLihvcXGgq6a8jI0h3Ut3Q377UeS0DRoi7C50vBl5zyjEK/R7MIEy7SSftU2m8Ib9dF7AFI1gtG4U2HRofoBciSN41tRlRtNR90WSH5O+zvB5GaYzEcpBNaadRUfG2qjgRuG2UKyuno2iWVUet9NRQJdGGFPsOltUUv5fENBcRzEJ3RTu8vpBit6zC2yHzZeDl3ecDP0yPYa8J2hFnplt6KAKUhdg/DAQW2rhTo5jz3sbLLTO6j2PdhNrcS1JkCMBYEpfLJxFWjwKubAk85MKiTd+e2qxsNFiHK2iXzxER0yvrCQ7zEsmreMoXowoftwhfMpLOntlSUqwT/Jv4+rr51VhRPMn85SZ16xX+c2vbRAsazDSlh X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecb33139-7771-486d-5f31-08dd7d5b5796 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 02:55:42.3783 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mpn6VE92fQk7QQ7b4XROqhaCawsV0D5E85a6se/ETGQv+WiG2Qs5pTGdngQfzwrEwom3WKuLeTBOR60Ez1O88w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7935 X-Proofpoint-ORIG-GUID: E6_X35WMksCNHQBj4tZdS-RQSjKkH99m X-Proofpoint-GUID: E6_X35WMksCNHQBj4tZdS-RQSjKkH99m X-Authority-Analysis: v=2.4 cv=BaLY0qt2 c=1 sm=1 tr=0 ts=68006db1 cx=c_pps a=2/f09Pi2ycfuKzF0xiDRrg==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=p0WdMEafAAAA:8 a=t7CeM3EgAAAA:8 a=6uKOi5zTHXshXRaFOj0A:9 a=FdTzh2GWekK77mhwV6Dw:22 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-17_01,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 clxscore=1015 malwarescore=0 suspectscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504170020 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 ; Thu, 17 Apr 2025 02:55:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215025 Backport patch to update __version__ to 0.2 to match current version. Signed-off-by: Yi Zhao --- ...__version__-to-match-the-tag-version.patch | 30 +++++++++++++++++++ .../python3-unittest-automake-output_0.2.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/python/python3-unittest-automake-output/0001-Update-__version__-to-match-the-tag-version.patch diff --git a/meta/recipes-devtools/python/python3-unittest-automake-output/0001-Update-__version__-to-match-the-tag-version.patch b/meta/recipes-devtools/python/python3-unittest-automake-output/0001-Update-__version__-to-match-the-tag-version.patch new file mode 100644 index 0000000000..c2e519a12a --- /dev/null +++ b/meta/recipes-devtools/python/python3-unittest-automake-output/0001-Update-__version__-to-match-the-tag-version.patch @@ -0,0 +1,30 @@ +From 8da931c5e9e32a15091d517b28cdf2e2b5395f77 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 8 Apr 2025 15:55:42 +0800 +Subject: [PATCH] Update __version__ to match the tag version + +Update __version__ to 0.2 to match the current tag. + +Signed-off-by: Yi Zhao + +Upstream-Status: Backport +[https://gitlab.com/rossburton/python-unittest-automake-output/-/commit/8da931c5e9e32a15091d517b28cdf2e2b5395f77] + +Signed-off-by: Yi Zhao +--- + src/putao/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/putao/__init__.py b/src/putao/__init__.py +index e8758de..00265e2 100644 +--- a/src/putao/__init__.py ++++ b/src/putao/__init__.py +@@ -5,4 +5,4 @@ + Tools to write automake-style test reports. + """ + +-__version__ = "0.1" ++__version__ = "0.2" +-- +2.34.1 + diff --git a/meta/recipes-devtools/python/python3-unittest-automake-output_0.2.bb b/meta/recipes-devtools/python/python3-unittest-automake-output_0.2.bb index fefd4654c7..a8b834a126 100644 --- a/meta/recipes-devtools/python/python3-unittest-automake-output_0.2.bb +++ b/meta/recipes-devtools/python/python3-unittest-automake-output_0.2.bb @@ -3,7 +3,9 @@ HOMEPAGE = "https://gitlab.com/rossburton/python-unittest-automake-output" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f6f16008d9fb7349f06609329f1ab93b" -SRC_URI = "git://gitlab.com/rossburton/python-unittest-automake-output;protocol=https;branch=main" +SRC_URI = "git://gitlab.com/rossburton/python-unittest-automake-output;protocol=https;branch=main \ + file://0001-Update-__version__-to-match-the-tag-version.patch" + SRCREV = "aebdfb188e368c690ea55cf6c9c9ffa1a52def65" S = "${WORKDIR}/git" From patchwork Thu Apr 17 02:55:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 61462 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 63AEEC369CF for ; Thu, 17 Apr 2025 02:55:54 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.192.1744858549381187391 for ; Wed, 16 Apr 2025 19:55:49 -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.166.238, mailfrom: prvs=6202e9a415=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53H1eWYU029573 for ; Wed, 16 Apr 2025 19:55:49 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45ykf3njyj-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Apr 2025 19:55:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lpq7Gs03VcpyF+O/RkyjkXduxzOYguA9LwP47roMsj278udOSVDq2/8oiOUWnLmgxNvzDK8QqTW1PEsKkAMXTU1HDdEkRK6OtGCzqb1LmwCRK5LbPZfAO5TNUWIzOBZru3o4pU0prvLcd8ForwWWKmMfAZ4uyRjEgfvfEDTNBBXr/x3/D09Y84cEyoZmBCZv5HHJQjtCg5sBKp7UoXkvb8kGc6vYJ8P748+4qGdUK/VBQBe45fvS5KDZ8rUo2dnjPG5mPcy/BPLlxQE4vU0TAY3IVd2ZIeMJQUypko+MX2Ur2YHqbGzuDHqwfdIBMfGnBIMli+FwGDC6JHsQxOPqxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3qQdKgGoDWiC6utFa5f53DQqzva1oUk/NV1KRvPyfBE=; b=cASjQsrpIyiIlhtNYMx2YuWJQRya1TaYvqJ/t0TKJ8r/pCS4xPDjlOzpyLcaq/VBTeN8UpY5xORwpevBboDxp8OSWRGacOmaby2mKIC7pgU2LMudMko3ygPdAReH7TES2OPhj81zm6eiPQpvXNMSSYi5ZE2ln5BZTASoEwhAHWPJwtMjz6+mjlFnBDUytQZ/0G+iUmB8r1BTaUR5KfcEoPFCFilqCjBGrWrjtnYWFDRv6qXHRf1q5aFwpnMZeejMEVgCR2gQQ4e6l3qLVXe5OFpT+rH75EVmSHyzghe5XVAaYnggjevqi+hPtmg9Aljix3RgkLgf/UrYjmRK6JAKZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Thu, 17 Apr 2025 02:55:43 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%4]) with mapi id 15.20.8632.035; Thu, 17 Apr 2025 02:55:43 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/7] libgpg-error: drop -unknown suffix from version number Date: Thu, 17 Apr 2025 10:55:27 +0800 Message-Id: <20250417025532.1363790-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250417025532.1363790-1-yi.zhao@windriver.com> References: <20250417025532.1363790-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0133.jpnprd01.prod.outlook.com (2603:1096:400:26d::14) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|IA0PR11MB7935:EE_ X-MS-Office365-Filtering-Correlation-Id: 86afdfd3-867a-4a06-a96c-08dd7d5b5855 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: LbA1coA+CgN8vpt7XfH0mVFpx1s9V6v15xvJBM9RTOJDzweK2pT1NK+BMiJd6u6VEr9fdBmQlzOBtBtfQs1/CSn34LgvYrzkaH6NRcW0Unc8B+J5POdqTc+xs34UQzbdx+Xwmnpu0E8BY0LS52kCO19BQ1lEO6xq/jUGz4lqaKDJAYxHbGLkxVLk7IeLtFqEHzwulsyq7dlFyf21wjawosXESQkZCb+tzo5tmf5EcqpzQVF+eZFLuDW4j7xOCqzT9EO+8YeFebBJqxmGNf11+RvhGEskQY1JLcz3Bv3UCU8W82SH1CS7P5yZUNeaBRAYxN+v7RKj14J08qavXdKXYX70tug5y/2R7KEWegu8gBjJB56VTWjqZD7MWPNThbFH1r9EDSbE2eNnIXI4mGcY0jiI4sAjyhPORj81UGCUrtNXYi6V9fYwRSFfzitpZXNsrEpvAa4IxRpOC6Ac3Rpn9nkdOLQLgxM5BFJYfsKUqFB1g0HTyUzr3vZNRGtBDSzsoNaP6chEudElPXHOrDNPfNGDjTamfgeS2B8P9IwN+v+BvUP/6cbjHpVBl6BGqTYV5//Ln0vawUbPK1p1ANy4JMbrZ2w5ns6P3w2OxWHOOL9y18MAg6YUI3Sy0ObpdQ5XDea5nhmR35s3DddV3tUhpxtwjtRncBNiDR0l/K4dT1lDSZz5gfeXpMDvhGp0AN+K3m1ES5/M2AhZVhst6ZO8qpgcj0PuLKOWpHU3skSMe10zhn7dMT9itebdIzm2h3bLKb1WFXeS/zuCMaqX8vCb/yiPT7rSMTxm57nQo0g7Yvq2yTDDTFb8guA1ww2ND62FQLtGJ+CyGtTdC7i/Lo0JimY0CEmXGJ98qNOepAZkcmCrwfj5knQ0TrbE3RfVoS894y+xXb6MylXfBWJCmF4fLyumS456FeJbdCG6bWkcPyzUOe18/SpUToz2GxkKg2jO5nAfmvvpSQS+xwogs0pf5D/MOn/hz+uKTeByyo1YuS3rlhQYPokmQzKHirHDTZ+oJDLtjFaK36VlpnwrL6hrKKtJU9EWmrbt3fx4uROF+wc3mxwwRbZMd1EkKJrZepsatgrIkNIdiG5ZJsuvbgX1DOWI2+X3wMqxsybk2WneIjxTDfFsNrQUJIQAfwqIqtl+sdMSabpbNWzBoXX52IVPHADqxAsbYj4jf+RQnb4mdZUYXkBhUaGYybl3kGOMgRY1Kv+NOgGC5ULKXJfdKWgvNUfSZFl9RVPxENv2X5geIkP4sroR/vXQXXYdzrA3cPQVrY/8aRSuRUsKHpPXb1HJ22pdJZNlA2vneRnB9SJuo2bj6Qr4w9XCch/02vGRzolLDJje/zmrRs4dTVaN/8vNkWHWUNCeOcw4cE+99nUVomYuhFhpG+5gxj9VZ33v4xOxFROLJAW5DVoSaE5da7NPh7Bb1oQ/e8P2IuwOymUUQtE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8qOMQlv6B6K0K+J2h9a+v6OLL6CtxDwH62Lmtc1vkB5iERVyGfdtP7DT451vZocvoVfsL8qnSy3ntI+5wYYuhOJX5czhcTcrnyAxU9OPyYR35d0KoGmV23B7I37IBPGBNM3mp07de7UQIEtpERjsWaep+F10kEWapSncqobWekvZ605+EEpjiC9E402faTZi45j/UxqWk1W4rNOZgQhpL2rwUfNZsV+pWrt2L4fY1sQEhPT//0aJDWoyqYBfdWELV3xm2C0avjle5LhuBf724AUW6tI7v/msMi2KnqnN96fwttz363af2cAGb01XJvJ8Zo8C8X/EIPZQIvO1k9lmSFfGxKI+oZLSNZTR5l1gR/MhSzfZQ9clyeKQizb7OyjlsLjh/+A5tKt79LlgMzRDnDA8b0CwKD6etHaafw8+ZQ28R572W4pHceJQHHrqPcQHcMNdLGZIZGLiXaH0T68ng8BkSvquqWGtBgbt+/ag/1pdL6BL5R/VJRey4Wj3BUHrSbhWuYx75qS++l9y+0Da4Eb1v7enM62sfm9YnRBMum3r2A6Np0J42DheTedX5ndeP9vJhJ/To0JBvxQzqIrKXwaZzIPJrQhzQNjfECvnHpq+gBm4bZIZIKeQWNv7VFsuUAWhawt6zCk8YY4ouJJaYvxl1M0hcyiUoz1OVC16LejshBq9c/TUJacXVfsuWBjKpSFptU3n7O8HN2rXcGP72QbNxhWnT0cTK6PIw9TtBnvp0LxcAyShQdW51kqUBirV9DUkbG5iZLbgWhEy/Lf4IU/FQOYvmXSJVCEGqC7J5bfKzMOoOtTxMC2r9HXUI6mgO/Ahfgo8Sp1RcnFM+ailXbHfujmER2TonwG5BQsxXwnLM7tXB8QYRM4QHjUsTk1mh07U22IkzZK34AWhHnvGHdSaxNsutp39a9bjbSR+HlMpfFeSuj1X9Mck2beRjK92PeWY+Mmkc/ue+wAMdrBiMCXOGwtp6Drqvbg7S+2QcT25uPsRNmJNVaPvk6vm1kLIiVOjpoBHu5z1oHuzyfZwfqXgkqGZaxSHIIq/aK7rOR/v+PDDKOEpyqL4Dvbv6gzXsDiDhl57TMg+RTox4hD8Hkkhx3mQ/JOVtqElW4tVBEDR5ip61smOr+nAztnkMbibK1JpyzgOB9SmMhpzXFmFXbdcFTkNixPGnqq27cDOa/OVt1Mc85AlGFmW2V9JKDDDlpkCz+4YZ5f/+xAJHccH0EYrZxJrGCgV0NY/T7vG9lFZFGMqThifd3nNL6V0iQion8SvY1iumE5BIDN2Seem96LPlnlQmocY4xzcb0cdOyf/LoPD2CcPXQQ9V86gLF/hTw1iNJx9mLkfFZZ2xTFxlY5jW3QL2ssWcq0I9vb5qF9Q0mk0ZUd2A+8c6ghrQ4BNHFAuFxlaoTkSlxAn/Djw+1pRVWI+O7I2LhOf/Q6DT8E16ImvKZho5SVwZNLzttfI0F0y9wNQZOT4NEKukT8+ERYM1kJ3xquHjQz9UejqAyDOh+HEpn5hi8oq2X7VuTj/enRDzY5I1rwGtsV4taVOEKa+rVUTjmVKu68H/T3oTc/FqVDPom2w+CKPc9CUJIcs X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86afdfd3-867a-4a06-a96c-08dd7d5b5855 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 02:55:43.6630 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ONnv9ax6Dt+BFmikjwkuFP/FuFQRGnFOlZ2Xz8hxqw69N5mkLh+BrZDrcfEOojd3GniYTf63e8gZAua/zJa+HA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7935 X-Proofpoint-ORIG-GUID: 6UBkJg_GWLkaZOZTeJplyU63RDWBqtff X-Authority-Analysis: v=2.4 cv=Wd0Ma1hX c=1 sm=1 tr=0 ts=68006db4 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=sODZU1DNDF4EVHEcULQA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 6UBkJg_GWLkaZOZTeJplyU63RDWBqtff 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-17_01,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504170020 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 ; Thu, 17 Apr 2025 02:55:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215027 If autogen.sh is run outside of a git repo, the find-version function always assumes that libgpg-error is a beta version and adds the suffix '-unknown' to the version number. Befor the fix: $ gpg-error --version gpg-error (libgpg-error) 1.51-unknown After the fix: $ gpg-error --version gpg-error (libgpg-error) 1.51 Signed-off-by: Yi Zhao --- ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++ .../libgpg-error/libgpg-error_1.51.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-support/libgpg-error/libgpg-error/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch diff --git a/meta/recipes-support/libgpg-error/libgpg-error/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch b/meta/recipes-support/libgpg-error/libgpg-error/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file mode 100644 index 0000000000..cc6c35884c --- /dev/null +++ b/meta/recipes-support/libgpg-error/libgpg-error/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch @@ -0,0 +1,35 @@ +From 7358f4ff6c711bde1d83b9a38bbf349a23e0e243 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 15 Apr 2025 15:32:58 +0800 +Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number + +If autogen.sh is run outside of a git repo, the find-version function +always assumes that libgpg-error is a beta version and adds the suffix +'-unknown' to the version number. This should not work for users who use +tarball and re-run autoconf in build directory. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Yi Zhao +--- + autogen.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 9f91297..daa2730 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -270,8 +270,8 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes +- tmp="-unknown" ++ beta=no ++ tmp="" + cid="0000000" + rev="0000000" + rvd="0" +-- +2.34.1 + diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.51.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.51.bb index 741969beb0..9760b4d107 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.51.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.51.bb @@ -17,6 +17,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ file://0001-Do-not-fail-when-testing-config-scripts.patch \ + file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \ file://run-ptest \ " From patchwork Thu Apr 17 02:55:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 61458 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 51B82C369C7 for ; Thu, 17 Apr 2025 02:55:54 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.198.1744858548642437037 for ; Wed, 16 Apr 2025 19:55:48 -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.166.238, mailfrom: prvs=6202e9a415=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53H1eWYT029573 for ; Wed, 16 Apr 2025 19:55:48 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45ykf3njyj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Apr 2025 19:55:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oOTiVndYOLq7g1Ep8yGGYbTmzj1xuLUCd7JIavMqH+UqSOvXwNS+Wx3voozbOVo3cegi7FIPwlnGZhlXMnidyhfKrrabmPRBM5LUgBYMyNfa7vTkV1DTYlRqa7cDOTS/eMGEEDkADyCrh7W8zSRl6QRpJdo+uY2GXkCkDptJ8RjpkWmun3Pi8oWxvhI496u2IgmCmu+BCNASu18+w/+eKvVcKPPLEN/TbbfZfiLHIU4Cqw4VjL4bMDc7Pd/1dFYrx/qOwC1Svnh9Q48qEyk2UHkHGwbSWfh4serf7DX64ENSDTq/kQPmZ9/5MmB/Koh2h+V+gJUOPUQM9xcFPkKX3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lW/1dHDbdvl5lsHj06YV2dwt8vkGg083ptB9FoUj0T8=; b=wrugU7b3i3oj2F9hxX4qzV8hA3JSqbrWat9uituM39P7fS6i7OLZTDv2D/4FgToRh1CMEdunh3nbTu7iuwfpPAYNnrF3NsINLGYVmZoSmZs5gl9LBw/dbEcMTSHkIqI4zoKukczsP+0eahn3iMuKnxlYVWAN56gRu+ZwtmIYQsOTsWO6X6ymzYH8K+SF0oEWQltnq42TeI7+PQQ3A2Nfy2eJYMHLMoUs0Kgr0ULLp1XP35lfbYQK4Hjir0/ohXsgSLM/GseBGHKtGqH5r522uUW/bMi0MrwGEonkgOErcCQRxxB+vt4odIBEfIo6crR6I2qs6ishl224DVdmnnrt9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Thu, 17 Apr 2025 02:55:45 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%4]) with mapi id 15.20.8632.035; Thu, 17 Apr 2025 02:55:44 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/7] pinentry: drop -unknown suffix from version number Date: Thu, 17 Apr 2025 10:55:28 +0800 Message-Id: <20250417025532.1363790-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250417025532.1363790-1-yi.zhao@windriver.com> References: <20250417025532.1363790-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0133.jpnprd01.prod.outlook.com (2603:1096:400:26d::14) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|IA0PR11MB7935:EE_ X-MS-Office365-Filtering-Correlation-Id: 732f6945-e730-48c3-1e1f-08dd7d5b591c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: tXt+HuSUPU9s7vco93d/7FEjPmEdx8UmUL9b4qqarGcUsWP5dCnWry1OQv9aIAbNXBCEw2SpzViP+Ub+APeGi8BXYthB2kxqNqESw458FgKZYVUuTD/d1ctrok1Knl/k3oT1VxMYd7qpQ+bCwJA+yMYu8V4xdXRKvwpa6ZpFIBlCX8CBs/6wO9/lluolKKoew+MxWPjSYsnUiLnax+gjrlZePDbvAxx4sHkmsLyX6UShdmEclQsAJsHsl0jDo3gpJXFkpNm1bha8WwcXeaEEDl2VvKJpWx2LbZBzry++6OPEk23rd8HSwDj+qee3V5vi8GNq4kf2VH1KSCPxOrFD70Z1JqO4urrbSxmOMQheplGLsNnq0PBXZSPV+ca6QTcC5U+GrinuoWOP43XIwaaA2mHjBWXJJOuRIrIxLRUDMBlnM8llUMyZLKwzVTXUVOsgcwDQzr8rInwaNI7cggfoRxiEF0UNO1euwHn93YugwMgHsNC5/R+5g6WCqCJ7Gro+3iW0ZrKTS2Ubv9PdSsSVJEqSzLIiVN5QxQsRWz+Rd9rqzdy9Gsfd1dC0xRKH+rA2aO338J2s4QBYdBSF7pjqQ2Dn41zXkv5UZHkq01KWSksLNJkUDE8MEoAVEThy9k/fVZ4kI6RgpjWqTYwaaS2KycfmyZVooa5syaknhQ+bSZEz+M+5kt6oE8P5ta+O3sYmY4QKb5QBwbfY6WyoZRO+fitGg867inlDY3KG63WsZ2GipPaCmaWvabQtZ2YWUE31UShuFRJh0GvcPwBdgdvinzBt01F+f6ErtDuuOylhvZ4P92K55MxXljTDYaf9xJ9LdruE0OBTW3VGgE4kPadeEX1xda48iuL2n1cIP23lScEi2TdBCWfnrTuNUeqo6OKKcdIRegfHf3zE8mQnt6OQDZvNjLI26/TWtoq591QML0mLqntQO7ZySNfxUlWLo1o83xQrNHK4iem18RB5YaMBa7rJ3lG/ukj0Exkm5ft4mstVnbJfhORoczU/BEZGuFNCwZqywQptghJFEHF7yIPDcLRNVKCA61SZj/+k+WI+koZVJaSnONNbnLsMMStKkK6EKzIx2WEb9UjpVZR1STiWInnxRgNnTgjWnt4Sb3OrNY7YngEVzqB65rwfCwMNxm/CrEPI/Z/rxtKjou5tl6NKwS39A4Ijfm0w6aneIlp13ZcIKd3Q+uMsps5VttweTcbZWXt8tuNkbMm0sUJLpFT4y3gub2F05gZzlo/OPqQjt/viK4MByNeDd+3cBtWTUFcxnSJ0zF0TSrc32I3B9++OqA6G6l/+zgPmWnTGsAwKeJFkRi+z4IPG3M/le0SmQyHJboNkQTg7wMsOyeexGswiW47z3TZBtHsKKNljBEvMRU/pWrJK2K6tZYjpSuZXdpcHNm/H0LX1brP5Z/5Jgp9ZtiZAVyDMyAWHoRfPxenhAT0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fS51Blt7HgCa8tHsmbfoAWDO8LKhJ+IMMZUccCKVzeB+AI+l41Pu/b180UV8XP1JAOs+JZ9Qp68OyXFL8cDG+DTFbXzBj+zvDAjQ6xkhWtAKybSd193V1D7Qncurw7m/zd1gtzU3dbYmtDQcg/lYoGr+E+3ykk6SRLY2TBeKOG2XlAWcEx6T0BpiXEH0ioe2WRL1zUoynAtqSFjyFxoyp5MtJdiP3HduqA5p9Kjs8rrmyTfOyhHRYgGpR96m4KrMdXY9m/Eb8oO27SsRm/zYXy13eMdhk8nD5DuzI9ZKfMN/dJ30PwGqzagNCyLXmHWs4hN65joVvMVidcLG89fH7chS1j/KN4MyYyDsbdZXEOaQwnLo5AouBhYrRLh9xKQ0FWjOP0ud9LQuiO9NlrqcpRw07F6u9bf2QKKHOrb2VKdeOxPyNwQacuFL3zAElFwFVJvGjPypwBtYE9QsB3qVtYWkN1cI44DTsuPmKe+8x58m2hnM7mxTV0q5Hbz8m5o4UkWGtKpwGFBiq5IjjTg+ZWji4ifCvk5Q+RQos/07YQ6PvVnYVD6+guFqyjgJHhpX+sJ6ybGyNeWEFkjDdGVcbi69N6X5iwHvF5KDqm4mOz6KZKvjzXZin4xxOUb2uOxkK7KRIDkuaXDcRWYHONLO23SwyZwD7D4asNuHzozz2nnUw4uJ6LLJTxIJ+VbXQAr+QF9yWM09YKs1iYi4jxqvMtGRAcGDHrckTrhI7yBcmAnDUhzJFPAXvP2Hbk5FTbLzJNF3jxa/9+UfsBPVwe1qEucXDYhEFUHhKzZnntrCJVmbXa5a3ACFwZwAO4MFjPWKlyVZA33qCclT+sLnBN5IiSO4hbq9IRDMfyvuEDKr2Hc03qmKjDxYzwBk4gVKRycFgViFBHx/8U44YEHOxPFHubDA7m1zerSKXwWii10cHZcAIFzuRHO9jprbwzj9Me77Urzb48cBJDpaKHJNuTEaME3jAOK9TzHhYgqXKGdUcPQIE6lQi0ryg2VsNx1/UDFz4x1ZUXgfHGhr4oA6H0y9pS7yse2gE4lRtSDd/Gt58txAHbk84P5bDrIv1hF8nbnCahF5upNNRJTl5+wpRcJMMNlnky2r6rozk0UBK3Tg3Lq1I6qlPQln80czuZ5elFLwUOxQqeswSbD9qcBU3pkJ4HqICC/hpNcBwh6cg1PjfB5AhhirCyK9fhWbjHMo3z+N7sws7++H1Vd00IAhAL7nLeGeqyTJ9Knennfc/I8Z9HmQqIXl7gT2u3ztj+PrpTI/zVFwNZkgRZAYETJcp4/4+nRj38wJNH++wfIvvdE4ZEw4QNHvAeTDGfa3IFuR0oJmKT8Sa8obeUgoFG+o+jg/3kurZQXzDwsdjxexvY7Wj1p5ciXfNx9gYFhV5R22kNgzFrEr2QbqfGTijQMWLR+cG+zWZAyrmu/yg78db2Hktap9StaMhYh1zv1MAxT2GylTZm1eJHMq4IIP96//FAzPE3ihLmel9Fvggz6pbNzymmiaUHlRvsFpb5B9Rk7R1n13v9JMR82x7C2IlyoNnfU5mvOgWqC+Urb8jfLrLzxSWUvkqju97Drf2O6jaYrM5aYi X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 732f6945-e730-48c3-1e1f-08dd7d5b591c X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 02:55:44.9249 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zIJjIH01A+iJGNYApjOR5gt5Y/AZh9l3UL4lOEuko+mvPtl44zH59trqZvW6OW3DzOZmh/tVOLj8maHL7TVjGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7935 X-Proofpoint-ORIG-GUID: 5qGNwZ9jHBEg1g0zjn7wp1emcZpVLJlv X-Authority-Analysis: v=2.4 cv=Wd0Ma1hX c=1 sm=1 tr=0 ts=68006db4 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=XZe7PhnZs3Yj-w9OOncA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 5qGNwZ9jHBEg1g0zjn7wp1emcZpVLJlv 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-17_01,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504170020 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 ; Thu, 17 Apr 2025 02:55:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215026 If autogen.sh is run outside of a git repo, the find-version function always assumes that pinentry is a beta version and adds the suffix '-unknown' to the version number. Befor the fix: $ pinentry --version pinentry-curses (pinentry) 1.3.1-unknown After the fix: $ pinentry --version pinentry-curses (pinentry) 1.3.1 Signed-off-by: Yi Zhao --- ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++ .../pinentry/pinentry_1.3.1.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-support/pinentry/pinentry-1.3.1/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch diff --git a/meta/recipes-support/pinentry/pinentry-1.3.1/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch b/meta/recipes-support/pinentry/pinentry-1.3.1/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file mode 100644 index 0000000000..29aed68e40 --- /dev/null +++ b/meta/recipes-support/pinentry/pinentry-1.3.1/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch @@ -0,0 +1,35 @@ +From 211fd00a631da3e907e3a78890bfd1cf3bbe069e Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 15 Apr 2025 15:32:58 +0800 +Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number + +If autogen.sh is run outside of a git repo, the find-version function +always assumes that pinentry is a beta version and adds the suffix +'-unknown' to the version number. This should not work for users who use +tarball and re-run autoconf in build directory. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Yi Zhao +--- + autogen.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index e6efe33..6acff4d 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -269,8 +269,8 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes +- tmp="-unknown" ++ beta=no ++ tmp="" + rev="0000000" + rvd="0" + fi +-- +2.34.1 + diff --git a/meta/recipes-support/pinentry/pinentry_1.3.1.bb b/meta/recipes-support/pinentry/pinentry_1.3.1.bb index 14b368177c..aa0592d569 100644 --- a/meta/recipes-support/pinentry/pinentry_1.3.1.bb +++ b/meta/recipes-support/pinentry/pinentry_1.3.1.bb @@ -14,6 +14,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libassuan_pkgconf.patch \ file://gpg-error_pkconf.patch \ + file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \ " SRC_URI[sha256sum] = "bc72ee27c7239007ab1896c3c2fae53b076e2c9bd2483dc2769a16902bce8c04" From patchwork Thu Apr 17 02:55:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 61459 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 626E8C369CD for ; Thu, 17 Apr 2025 02:55:54 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.199.1744858549812848753 for ; Wed, 16 Apr 2025 19:55:49 -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.166.238, mailfrom: prvs=6202e9a415=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53H1eWYV029573 for ; Wed, 16 Apr 2025 19:55:49 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45ykf3njyj-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Apr 2025 19:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mpLvkd22NJVHZjeMGd+eJnv9L9EgDWWA7b39CQrWtBzS4IvtZbX3dI3LU5BOHLqzDCQrv/ZKz/KJR9JKqkh9Q+EwnUNwvMgXx7CsBI4I71jKDUDM3cFuY3W0RYrghQO3dRmbAnH5oOd0s1RjTwMiuton1poI1lLDZWMmAuqgaCNx/svgzljdD+byj2B5h0NGfiuxSy2NgZSmnyezi4UHu+CTkGIbHKf/nCBdHIvA/x2KPfuaY5GsFqEAKHRvOnbBxSQjKPAlmtnojBoPvNzI3Cp+eq24Z7CaxcZ8bX0TL4+BFZ1FpT4W7K4PvA0qhT1tu3gErf69OHQk17SPga8iAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2Zcfs/X4YSWy3D8ocoC6oKnaUpoSfZuv49x8Lh1NXvU=; b=AJx5yK6QcD9EtAiOPpbPlHF6611f0VZoH2oUl/YoKCKt8LVqHdeAneJEipcmzLq2JvA4X50q5YZXRsE/q16lck8I5wqCK0qldFIxJ2unAgqS6KPx99fZioTtEAewgV/KVtOOO7Ik7R4cRz9FaRR8WXN5rbMXcrHeICND6R++nG+LUs7Eyt+g8kEKiUyIFkcsjR7S1RaYIA5+HxNyabMRMy7pTewhcJ3qr9PWVOtSMbNnCxh2wirKXvnSZgqfBPKL1UIBXWMqgl+uPsKuswJ3nD3OKEwsimqzRY5TmWnN6hOpxIgkPjprmdOyHpugb0jeA4WhdL4sy1GjoFqEZGHeOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Thu, 17 Apr 2025 02:55:46 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%4]) with mapi id 15.20.8632.035; Thu, 17 Apr 2025 02:55:46 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/7] libgcrypt: drop -unknown suffix from version number Date: Thu, 17 Apr 2025 10:55:29 +0800 Message-Id: <20250417025532.1363790-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250417025532.1363790-1-yi.zhao@windriver.com> References: <20250417025532.1363790-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0133.jpnprd01.prod.outlook.com (2603:1096:400:26d::14) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|IA0PR11MB7935:EE_ X-MS-Office365-Filtering-Correlation-Id: 75dc08bb-e3e6-41a9-5363-08dd7d5b59d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: UPCv91ff61FrFQbfNlx6XSvFN1HMpc/LEA2Lpdm8h5rEXN0+Xln1J7wvy13MnuvDt9eQkB/wUJJSfFuVw0nQpsaguK/uBASw+aaY8AVFLfZ9rLjYp1L3xRKttsr55ao2ABv0iTYe7Xe1UDwlf4gEHchkppXVg3NoySrCtgQffOtw0kkKh0j6sViRBucQ2l9I01z2FHK2ycCqTTQWVpoMvdF8LxkGuc6/KaIkVVHu/Q3+PxFJrpfbFcdwAyeeTKZPAL65rhC9i74UHdxKrGRTJX6Nuj9HF9DZiq9yUE1nbb9GclLtB3MZSFvPNQE1kqWtWxYUsWbWEUa6mHGK40XYNKgedxYAlipVNgKlmY4nhem0pb63caguuDvd5OUQ9jDYSmBQmq4WYfnf5Eh08rkbmUEfz207Lj+2NAtP1J+EZEzVo0FAdazimlFOd4K/Dfw4uAFBxFqFSR+lTGeEj+HnsYYsuigjBV0Jlk+xEidjl0dliSW9gK+KntFdJlgf/H1xbezPpQA8ReuGWTcKaZU6XqCXS62okUORC1NrU1QjoGh5CSKkRkiRYsiZ8OuQva+2nOt+5tdLJkMBs0OKdHR4xsoeNctfTVjRUmoafskpDLta6o3NnJcDfe4B6wF3trxeCHS352sh7sQ0AIkWmmCLOvC3M1VVUIQTskmeGCFwYyd7nnbQNlpRudX14+02+9mATASTFfwvYxqZyQzXrSMAGC/laELodsDStfFPstMFko2GRDtn/gacqJD6+ZSSSf4jkayMbhRtCLKsxrtXOxOkRSLReDucIcJHLjtXZ1Gkmqzp9ohZJ5UI8OZER8mDC6J2DeTgmSYwBpcUdIx7pIu4U2OA+4uLtgqviutHiSPxDTdpLVDiGl0A6KMxYrk8IqyPMv/c53SLCQe8o6y6TecQcMtl51QoVR1sdUnMwWMeeYKaGiwJ7DUy1WM/+E58wo2MMR0uYJrgwLx8t3sMvJLqcsp4RkZw/tnN54rrYtaKq8WZD7zeCb2UkIavXFr66pzJVDSfWRBF5r7mquzD5FqT+I78ilukAqWLMS4yUkw56LStBSqwRknz+v+pr9kZqLyqVYGFfUu3F40Ro3Cw8UXRyJA3R0Tio8mgko+/WeOw1qOYDmXX0dE3J2O7Fwf1oUC0aFx05n4ZKa9UHGbHpAtWkECBhdSbApwOC/Mqvkrcx/dSqH+TXYUS69HOwdqE5KxuGfIKHbA/0D8XP3qacAZ+lag9trJg4j1XpEGlANAV0FnOE6HAd9+WVYXYL3x0Ci0NzQ+xR08u0dJGmdnqZRovJa8mNZlfIg41sAH4ihaWHh0agdLjK/lb7atcRz2AflaoI4279BMInTm4EH7/35M8lMDBunjBBTn3ZwXQTcZfufDmPsz2bpnkpZtsymejRs1nyow1vMfG1rilT5XUgXPBDrPnTDnAr2s8hN7He7BLutnp7Vjxf67+Wx+FG6ytE85oklU/tXgybPIu7svAQ2D3Uw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 990gFLy7wnN6IRSGAtzS/aJNEu8ontU9i58XCUsVTb/5jXBIY+UsYAvwDPQ+jR+ifUAeQOyiiruYjPFYJOWeAMmyAD+YBtODvANo78Nzwoxi32qh59oLd0Dl1fpTPaRhWG6s3NmaduNy9khdCoVEhBVeyKoZjLpF0+wB7x5ZFcqwNQaZ8IG+RzH7G2whXeIOnE0cqKx50qpK8A8L+7qCJgqi3No4NHwEoG6rRXzFgwNh5i5qYHsuQpG6q8OWfWQr80A8i/dWspGMeiTe72C6RRFZyfoilSv7XBh0Bpo4wfZ2cldcIO6LfzyCP8Yphjtjr9aPg9NivUJPwjCl4nimVLnoCESG5yMYsGn1BBljKtMzpnYoiAGTjM+NlhrsP/IiDiJz6fk5R4aUubuwszdJq5kXWxU6cgCEaFuUVl8iBnv+Tpdsm3gHFzliy+5uFjhjqbm+o/EY5MZvHRzp1VLBJgy8hjOaaG5wMAN+iqFAgASmDsCj7jnh89NY30yMLLkeUJRoVjTv8e0mZzxCPzlY3wbsn4naBGBAFo9+Y1Kguq/5RpSWHfy8aGog3P3WIGuzoKAzK9bxDY7xkgi5IXVEh65Lv1WTemff9dTeB864wTUDsWQUPpyBKONTCN9M9FAByLGI3mpDXZr1riw+FzVBRYfPcA1vENFbwGpKu1qxX0gCI3cF6FX+HnJPsKCPzKTX4YDVwIqFPUdru7dYlgo03XnBgy2ivAi7SB8YMTIFrG3aALCjBDA/bLt3jrH0OdDtwqBI4Xm/cVoFB40gzYHfOHc26ST3m4mr9nGw81kM+WGO4vpmuHhIEb95je9GT7YrqQzxChNdiet6DW1pypngs6PKMPnmePm2aE1rEZCrN7aMhOg1Z5WXkRfCLsdK+1la3uFvOLC17bYOex9w/Z17ZJn5sME1WoJXe4nMdUDvFIClmYdzme+T2BkaJ22LnivxvdLAvoA8fhsdi6zMxa7ZmoJQU+hquI/xMJkzAtryJlLR4IkfST9FEXxwGs5pGMUcfHP8h3IXmkrl0BWiPXWjif93c8497bDt7QUlvetV10IKOSHGVAn3SO6nUxcPFTlnOatxpDPX8I6EGGPfWePexWKLFlUngsMI5K2mRcEt6M8M8keXeKXBnCVmdNOUSCzE6iho8DZj8iHvIxU6lRyh+8/i8mHMuilZNGVRzOUvjrUkvmEOiG93vHcRyy9edlPdsplAfM2dcjGW09Zej8EcFecbvWuvdy0L3AlVP3xCEystar7kCPwzNhRfFBTk7bhiDPJP1geRRajbTwFpGj61gu2FgJlRkBFiCtr5GSMLjj5LUzi9ljbiwWox0DGBvBNNQJjBjEnMsi4cjiYE5RkGrb6plNnq44n5tMdNswB5tFg+kRsT9rmpdK6sVvdZn9WEOnnKqwZ2tlaOQyRDbhDUV0xcxkdReC3WKEPUJsdPY/HmTB5lhQn4TE6izFAtFweJR+MdCkSMa6UjQuwBhsLwdp3mSYMrD6Zv730vH+tkJlm9bXufkT/sbBUmJy6iuLqi7iaHb+0cJFO+RRhQcwFglw8ojNIRmEMYS8AQuK7Sf1UYDKkWbj7Cn9ggHxTsv4Ya X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75dc08bb-e3e6-41a9-5363-08dd7d5b59d8 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 02:55:46.1385 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mFqBURAgVL5KxiSUHK40Qt2rtA8OgMC68I/J9l7akU+MYxqgUGoW9M5bMk2PzticiN2P5BW3keijJGeQhQ/yKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7935 X-Proofpoint-ORIG-GUID: 7cdpVwBgkNiVZVwYbuPwmWuRkwm7-M0y X-Authority-Analysis: v=2.4 cv=Wd0Ma1hX c=1 sm=1 tr=0 ts=68006db5 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=GKLAf4bjMrQHtVmP0GYA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 7cdpVwBgkNiVZVwYbuPwmWuRkwm7-M0y 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-17_01,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504170020 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 ; Thu, 17 Apr 2025 02:55:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215028 If autogen.sh is run outside of a git repo, the find-version function always assumes that libgcrypt is a beta version and adds the suffix '-unknown' to the version number. Befor the fix: $ mpicalc --version mpicalc 2.0 libgcrypt 1.11.0-unknown After the fix: $ mpicalc --version mpicalc 2.0 libgcrypt 1.11.0 Signed-off-by: Yi Zhao --- ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++ .../libgcrypt/libgcrypt_1.11.0.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-support/libgcrypt/files/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch diff --git a/meta/recipes-support/libgcrypt/files/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch b/meta/recipes-support/libgcrypt/files/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file mode 100644 index 0000000000..4870d4467b --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch @@ -0,0 +1,35 @@ +From 028305ba9ad7769d6f1747a4945949ced8761ba9 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 15 Apr 2025 15:32:58 +0800 +Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number + +If autogen.sh is run outside of a git repo, the find-version function +always assumes that libgcrypt is a beta version and adds the suffix +'-unknown' to the version number. This should not work for users who use +tarball and re-run autoconf in build directory. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Yi Zhao +--- + autogen.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 9b36158..4b2e657 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -265,8 +265,8 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes +- tmp="-unknown" ++ beta=no ++ tmp="" + rev="0000000" + rvd="0" + fi +-- +2.34.1 + diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb index ea1f34e8ce..712d2157f6 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ file://no-native-gpg-error.patch \ file://no-bench-slope.patch \ + file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c" From patchwork Thu Apr 17 02:55:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 61461 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 49AEAC369BD for ; Thu, 17 Apr 2025 02:55:54 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.193.1744858550322349109 for ; Wed, 16 Apr 2025 19:55:50 -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.166.238, mailfrom: prvs=6202e9a415=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53H1eWYW029573 for ; Wed, 16 Apr 2025 19:55:50 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45ykf3njyj-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Apr 2025 19:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zFojpuKS3v7dO7NyAohCumNIZeUi5a8/EHO/SYG9hgaeZDTIdyC9phFwapIpuHAF4+u9swTs9VuGaJRkIUhtb7sWkjfWEe7wCMOI+wc4W0FJxhCFnV0mo60MRI0cgxGQHHbGXF7mwRnEcecP6fd7ZX31jS6MsBIYKvYM/5T4VCCUKbb9TTQRkWCN2/YSqKKaNCUDImarXT6hDe2wuuj/tU613G3i1C1T6dDCRb1kNGiXiZqXqxusSe4HsT0lwwEAVpQeGXD8evar5v+eBlG1tSM9Ri+rsw02ALlBdFcILd7EgoQ1dODT3dF6twcGKGEkzo3z9/EZSPmDQzupsZReFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9FkAlukFWKDlvL8zlKqVtqxMjcGqIzFmGCjOLHNeE0M=; b=RnRSqYqeToSfP3b107ku5yWqk/7ECI6TV0fX6GU00RU31NgsjcaaIgxB5ngWjL2XTCtABrLFEsCFM7EoS7ZqFJNgVABt/fAk0Pd2a8l2l7CC4uxB+FaV9FO3gK1+wuP0TJ+6hpCN1VuJAF2+s40qe6Q9Zk0aIf2ITEwD03dW5z5eXqVQYRma3QkoOX6XxPflLCv6PxJSkIH2Amok83fIGlImfPSC+PIdpANaVwFo6GGk8Z6m1ABghWhISAY5G82D79JoqbVzIj6xG4x0rtMM2nq1Kv16kvuV6DiVfKv8auXd/kky1A8Xd9Lg+6MpYS/QE+JaUpuldOv3CRbVcn7yyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Thu, 17 Apr 2025 02:55:47 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%4]) with mapi id 15.20.8632.035; Thu, 17 Apr 2025 02:55:47 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/7] gnupg: drop -unknown suffix from version number Date: Thu, 17 Apr 2025 10:55:30 +0800 Message-Id: <20250417025532.1363790-5-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250417025532.1363790-1-yi.zhao@windriver.com> References: <20250417025532.1363790-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0133.jpnprd01.prod.outlook.com (2603:1096:400:26d::14) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|IA0PR11MB7935:EE_ X-MS-Office365-Filtering-Correlation-Id: d30c16c6-2bdd-4119-6373-08dd7d5b5a8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: Kwj5UmwEg4FNIkSyxrVy2Ocx/mb/+AfpdCWatdcFV2SKaAnBBz9ptmuDM8pDOUHq3QSgreXIT7cL0CQMyI/46RS5USorI6U++0BqFrApc0+nqttwOqhQtMkvxhwxIkUtR4/L96tkrY5H37MWg0sFFntPGddb+4NMuvaiUI9hWnt0ldNRlDUgVlkmUhFmFoLYM9knE1U/5HYBjJ/m8vzuPdIEfqHEN0R/0x0onk/SDGPhYDqSzzt3ot2J81pM60KJr8Ui5NM/o0lDrCjZPtBBI8WSIU/0KjGE/W1YMu/vwKGVUYu+oGsfCztBN9XakDfyXxJcygOca3+fCaUvsfiTE3jO/mNkBSrDundIrSudB8WV+9pKeDZe0+agjYubGxHFe5b6a4niw3H5Sc5K7IAwqXvY2C1qotDLNjlLc7r5Hg0/95kKJrOZe6cv7KhyH650uPkKGlKvOgiJya90K3wg138wjwZkjWj2lMlO98h0Wquu1mgTtza0xP5/EilOkEvJ2MOjR01YOwy4WM1kwvyPnOkBH1GX5bnx4J7HUfTSXe+SFEtHoJ4zGCp/Ny/8TIIgEaU5AQCLhK56smKwsKeAikPXp54ayQm7ZZ9ZOlbeBzA9GZVMoKRzzani5iOaSdTsw7JxtYlaWpuPVhARXf29HKRV7f/b1NAyxpTkjJxoV+Nh3hRyrT5TV9z+BXxkoJkmMurcnXKqfEgnJMa/p23kuMixKTUald3b6uJjDl5cwMX5EQem0szN6bFm6e/R07UyA0jwNf3ZgiN0BWkgluEVDK+yVA02KBZd9Kw52DtqOQHcMAbDf2/ay43CJS61GJ6FQ9pR92KuRYLnhNdmsfGoxlsDXeRpNXC+xcw7PKnMBniwyN1T3xIjsnUJM4NwsaxTDPzj/cHzBkXf2ld/4oD/kwm7Xpf90q+n4dUOgifEYTyop/NJQppv9YLy80EdApkfXDWIIfu/zN3Ts6cXKoqF8RWfgdoZhZPLWhsqWwSYmi6EgrWp2B4AQjVVfwsYWeDRo7g6dtprsCwGoxFsouHhCuRCDL2EZSMIT5p+qcQuTnRR3KGsTJWycl6KUqykjzj9g4Gaf6K7ty/+xemxdFUFgdl3fZwa/PmjWXVdD8B6nTBAI/VDDA9T14RTNN2Bval4P4QydOg9AfTvgy5u/3kZWn7NSYw7huFSgpaz3aSst8fZGvWsHfw25s4LTdP4HF1IDnX63l9NtWnGnG9/Dv7thFx7aN8yb7wrwftjbwt7uuZsIMNwzd0NoP4ModbyxLTg8aO+aA8gcWZqrS1VmYX7p+Yn7VDAnjBxSPgdjb37rDDLR1vBkp9nKfqNrtoJL9Ol+JHZyY6xxLtsFovtYSyUJXzSXlBWkS4WHAVarEzsi3DHmSfl1Cw4PMftvzOtPhxfqvFQMDVkatXuTQKKG5NJlN/KSoCj6vGQLRCYAQL8pzQqwZb6ltVTHIVz7Pp7VPVRhItECAzBoeCeykLxEcUKDA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UDb6Nbq4OrrYW6F0/dWX/Ua6+7og1ND37uvvHFR+G98GuoBFW832vuTZr8+RznCkdBBN+Qz8uZlYMY5DA03NjrSwzJXbRQ2NoFwE3qTWi6KmJE3KJiuvfx3VeFjY+g0H//40pkl5BLNlL1knJ+AflPD0NdJec1na78tLlbbZASIb5NJ6EVaU77rp3+hmi95hSwzx/q8U95PcWS29BdTG3ZDKCVfsxMbmvHpuqtEpdHtXgVAD7NQasDNK2PulRBSEX5eoTEgyKnY6OuM3Y6oJgYS0dbaG/HdmHNOQDwcC8mdaDHEt95o1/VbVHoLhMrFBoRezW7VDP6RJQdCivzbDOSFFBOkMKSitCIV9/uoylMyF1LgiV+SE7nBOHpIPKsdeYANoO1x26p/noiryvA1PSfaeump7TuU5gECx3vmvyTkq9NCO13qsDqK/jv5SB7sMJfDRGSwosYg6iRrLqH3ZNbo6Tap/UMEn+S2TB0EWm3mbKK0wV7DTQK5kcefeOezfy6Ul3viosgSxAhgmu93yrVherNPPKW7MESwbd9J60BWExL0sGww+wN4I4jfUi/Mq1RfT6so6GAiTc1sOFz/QBRZ5Yqc+EqrcZcUlEsfbuenBhRwaDtwpCgWb2Gt6I6Yuzep/X+X/yJAWKg5B0ah5Ffg7rO19DBxD6Vut6KfQ6LF7WgnABhwEJZ31YK5/VjeyQKsZUS3jeIeDbnnePVSedEvHWkdd+s0yXalBzqXQkrGKC0KMB+a2pHUtyp8Hp52UEiddUUgTh6izigdGm9DtCkE9FETkKaDlSkfYo/j8rdagwbXgXFbaON8GAyV3rpCqk0eHPCzZHWiz0il2HfbVoJN7oVV7K7zWPKecG2z0DFc7HMvGvdafmJVI1bTr+iKDJRWx2rtfMmO6KoBrg3IM4B4yDWj1ZO/Sdu5ch1kJ62km40M58o/6qYNKqFBjiwF4bsg90FlLPpnoFfJT7VlUjpd29+RlmwEA1YYzrIALxHaJExspZH7y7OPOES3pHmqPDnXMDGq/fUenBv5LI54Ttr7cRI9XGaQ0QroryJ3qiIHJcNS7n1NH3we3CoFDKXZB+OKtZPiZqKS4AeA5WM2OJd6mm55vMeO8mtXp8GtBFLq4TpBgrOvXLwr/il7O7VwxtoFUL7VgTzjnP+dcD3/8JcOWznG4j+z8BB15tdluWdOwqRpJwUXPteYL2x43ZfDGv5RZC6WxLa6uA0IgCUSwyw6hN9UJHhuSoI97BQNSGy107Tp4oiQLQhDfwI5EdRLmv6OJN03oglkekG1O7rKaY+9tFxZzvnnA/x0fn+Q/uImSqIJNk292nQHQp3ns9tctgbIDPorsB18VVsYibl2xZnVSW4gZn4xCi1S2f9lvYRkl3DL6e3Hdha+viQl1zXvyymQTawRXoKwZMOryfMpz8F2HYXqgnkL1EMJ3T1Lz+wRWYP3ExN9E/Vhec3J3TP3UHCKwVNaPKfcMzySs2DzLf/WmbXAMylmpTjIbYMBrWG0ZxseKuvNSW5kBDlYP7+U+3hmxYXVRsjnhMegwU5082j+v9H3I3DWgVI/Zsy1Wn+I2k+DlpSmAFCKTPJgNuWlW X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d30c16c6-2bdd-4119-6373-08dd7d5b5a8e X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 02:55:47.3355 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uvTDaMNbzltSR4pEkqOrNYLNjTtPipGJH26q6e70DO3yu7l0osVRMmGMBzZuXpsqaG1afLvkiIC40HiRpJD2Zg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7935 X-Proofpoint-ORIG-GUID: K1yCoQaveGVDEQ3KaMed-RM6wiFQmQ9V X-Authority-Analysis: v=2.4 cv=Wd0Ma1hX c=1 sm=1 tr=0 ts=68006db5 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=t7CeM3EgAAAA:8 a=ggHxpCNd9HcqE3gEoxkA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: K1yCoQaveGVDEQ3KaMed-RM6wiFQmQ9V 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-17_01,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxlogscore=795 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504170020 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 ; Thu, 17 Apr 2025 02:55:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215029 If autogen.sh is run outside of a git repo, the find-version function always assumes that gnupg is a beta version and adds the suffix '-unknown' to the version number. Befor the fix: $ gpg --version gpg (GnuPG) 2.5.5-unknown After the fix: $ gpg --version gpg (GnuPG) 2.5.5 Signed-off-by: Yi Zhao --- ...h-fix-find-version-for-beta-checking.patch | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch index fc7d964ec4..5d5e2174c2 100644 --- a/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch +++ b/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch @@ -1,4 +1,4 @@ -From 4d8cc1982273d571b4e80fe981878d0fa5884236 Mon Sep 17 00:00:00 2001 +From 8152507a5ee312889366177c48fd99dc351d4c41 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Wed, 16 Aug 2017 11:23:22 +0800 Subject: [PATCH] autogen.sh: fix find-version for beta checking @@ -7,25 +7,33 @@ find-version always assumes that gnupg is beta if autogen.sh is run out of git-repo. This doesn't work for users whom just take release tarball and re-run autoconf in their local build dir. -Upstream-Status: Pending +Upstream-Status: Inappropriate [oe specific] Signed-off-by: Wenzong Fan Rebase to 2.1.23 Signed-off-by: Hongxu Jia + +Drop '-unknown' suffix from version number and set beta to no instead of +removing it. + +Signed-off-by: Yi Zhao --- - autogen.sh | 1 - - 1 file changed, 1 deletion(-) + autogen.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh -index 9f91297..116fb7f 100755 +index 0b08e8b..0c5e425 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -270,7 +270,6 @@ if [ "$myhost" = "find-version" ]; then +@@ -284,8 +284,8 @@ if [ "$myhost" = "find-version" ]; then rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) else ingit=no - beta=yes - tmp="-unknown" +- tmp="-unknown" ++ beta=no ++ tmp="" cid="0000000" rev="0000000" + rvd="0" From patchwork Thu Apr 17 02:55:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 61460 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 5062DC369CA for ; Thu, 17 Apr 2025 02:55:54 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.194.1744858550919549642 for ; Wed, 16 Apr 2025 19:55:50 -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.166.238, mailfrom: prvs=6202e9a415=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53H1eWYX029573 for ; Wed, 16 Apr 2025 19:55:50 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45ykf3njyj-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Apr 2025 19:55:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gbi6GXPdMqK9UowAjLnehcDwgC218D1QoxLb6zfbA17HOkBHTmlAPp6bUPL6Nnr0m2ZWlrw2JcHPvhPEMuEGlANvMobisL4h9N26c9mD0Y2Fct9OtsxzAxM6PJtQWqnFfhSo+fpHaFk7rvm+wlKbc7cE16DzrU5BxxJ1eEnD+qgDr288OVU8O+7CEwoxJ0DcLCjg3qXJarsllOwWLgsisv9H+cAZEdF+1I97rdObP0rD5by6cN+io/9z7IlryjdSJG1qj2jk/pDHGo+PjTcXfOSkGzCMZrQs0vQy5iQ+Q6o5qXgrarKimMlkyIXBzrjZVD+qM5SOPy9ZmPD7iVQL3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OKjd1/l+yatH/99j4yALitqYRUOMjC0QHXvg0XvyAdE=; b=Ur7bjB8KsSEQv/CixYdyQSMYV7LPifNzHlOGpGlJXYgkY6FBu6WA+2Unl47TKe/U5jVF1B3zZpD9Ith5m22RgYkSz3Q1ocF6AG2iIQAOX0mZVKLO3hcK4b9VFYJWcbUlWx1pjmr6z/QbZo4UZ02q6zNixDt2+78S18mOVtrXIaZ6U2HoNpe2cqZgEiRE1Z6WQg5Xxl3+1PZfV0Si3W4gytyGM2T/6CFuAlCXNzFkAMY/srFWGJuqELR1DXak4kd2TmP85i7p/+SjnxogC3Fd0VjkKAQG8jFcAsuEa9VWLGp7CtPowNVMjQ0kVb0NBbZHuIa1tJE87CgXUsgU/RBadw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Thu, 17 Apr 2025 02:55:48 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%4]) with mapi id 15.20.8632.035; Thu, 17 Apr 2025 02:55:48 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/7] libassuan: drop -unknown suffix from version number Date: Thu, 17 Apr 2025 10:55:31 +0800 Message-Id: <20250417025532.1363790-6-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250417025532.1363790-1-yi.zhao@windriver.com> References: <20250417025532.1363790-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0133.jpnprd01.prod.outlook.com (2603:1096:400:26d::14) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|IA0PR11MB7935:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a1f9bb7-68ef-4eb3-0f57-08dd7d5b5b46 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: ZFvtUTRSH2huZHZw9ANww33Y+2sihwffnao9N2PJplLMmVO3kTJQgnhC7Q1tu/JX4rUXveiD1M6UoHl+aFYU+pGU8+9xwF3SUgbfP9DBGdNd6PHIuvpXatFynZyGVxnfd5ulYqZRjM6fsBJgTuxAf7g4rGkFRmwFpOv026oRO1PIsZshi0rlM+M27HtDBpuUoSnYy3qjOVYNZ3f3ilczaMBtvbJKv2RiTatH/M6FBBG/TtAxNexo5R2kD2K1a4S5U2i+UORF/1qMFFpynRgPhyb7WYLwcxNpJEUKLwz9d0mDfJNgYkbnNlpMVMcZcfBkeOAjR6i5Hg+ZR0q3kyTKp3stcLEdduoWVVn1XTsHdnntpOMaAc/DUW/X8G9dkLBOtKaAn1MC90NKe1Q0xJ3QMfsUQkGd/hDeiUAYpnjZCpyiSgfqrSYExcSpz/Wqil5zh/PsfWY1GLUnfYb+Stx/NSTm/zvgbC/ebFSsRoy8LQRAWgogD9elOSv0Zgt4GsvgF8p3FUQO2am8lDTFYgai9+JKMz2XR5XHSC2OvJfwULwd4PUvUsfOIqVLqNCC4pjOD45Rec3fSYOHjGBR5v9kDbt6Fom2+dOdK5x7IVfcgoQy5RxuMygOQdEa4WNggGRnOkxyY/za3lMShjUAMNzpedwp4T1DOX6lSANkqhuGB57XYpVoYd9n8XpYcXrgV5vWnRZVx6+MpN0qQhfLhgcMignWWD0VXRCN8gXvbz3VW+yjAbeZg5R37xPe4UY05vr4gsYteDVjueehujquVs4lZxXPT5iLMgaSAaDnAF3VfcgCmOvPBiMt0jPfmpvlQUNvy2/vyDRg6t6i47GSUAX4NcnpBeTv6gaDW36SuWbr50kbF4dxBTmahobaPSz1q+J1J4Dox0fjW+MCMNlRyDz4wj9+f2UQdWJbxjI7aPQCkwovIONwMYOXNAJnHc3RojwNib4FquBTdbYOl9SQeCk2vk1knZpMqIPDDz6oZMG5nr5ar5XSO1s4I2baiCAqItQmhu2p1UtLZ58xWTjVBbTr2m9SqRJFaEdE7+l8cgvTSovfINBFnha+EfaEban51n0L5H3AvAgR1ZOI5WWP6MDhqQH9IyHrEu0zeiHvrBnvljeZpDYNGBRRFng6efCEt6310I49yI1jly9Xq9O7BQ/ebyTwt5fppZhOuABDYKyVIC3J5WQR1vYvhmNgFX0EYvuxXkwEWSufyzoEDNRrlrd2enS2IXfgw9iUPaVyY5eE6sX1SxyYbo9U4+IeQYbYVgHEBb66ESzywrNGWc+i2vMA0TvCVOrDJKyDXKtc7IQmI+Mx86SVXZZv8hQkocaUk848OGJG4F3gy6HS5NZs5FYPkGbUrJhrp6bJafPjwg4tZhsVr/1a12aUHsXkblPC0rSdj5bg69OJ1Kjlh/LypjKaX2qYG/xFzswHr92HMYTCojQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XbnA7ApxdMPBH7CzjRM/u+Ad+V258t2ZSowE5ZJM2za4DWTjeJNxbMe+qQxYg8TPmEnuDt1jRAY1bhVhk2lL1YGUqqfXw15cDVp4j1/pxpPCILdPKIx3Bae3SvtEQP7d2SA8jQF1amJzPfB4wvGM4Lb+jDCqmfeeidW0qF4/+hBLBr2U+MZ6H0NouiaAnA6+MP0ka+tNjDOS2PvnmH3TOhqY5E6lBtRcD1VWJx5kPFo37bJv1PICN4XnNfVxUnUJVLhkZ2OVWXD5ejykj4A3+RG0bPIXARMDzEeOCOIMLhYcwST8hglMJ91RAS9F1vaBJ1h86mcXPOdyodhp6mEN7sMSsuQnvWGqpdPg1j0UsEZPZ0Qv2bX3na0QEReK3nHMxJTXgg2NhWjOZ6Cdy8i+VFDvHBeGzB78craInKqzY4dMXLuDqrD7dhj1djTsHCV8oHWQorWIXvSzeP83535ed0i76xET/eyImKQ9jQjn+FhRFG21lPs6B/RIfBjCow331A4TEj13ByWdIljM2eioCsySwIG3TXL0C9oI2rh2LrQOWLz/vjYe4l+Q0cVSBdw8CIDh6IwtSnCGTFZg9LRuBocByYzUIldzOM+zAwEfhi+hL74wZDG4TmqlIzRp8T9MU072KwqrCM0mOM4jTdc6bh4naU7WKHrMec5oq3C2OjZqKsgMppIQZ6LMy9rGSWcmEgQLFHOrl1IYPpLgAn3yJBsN+KocyMiEfGvqm85CAlBaGnGiWro8Yqpyw2qUSA2ED6P8UKlqMsIMBKjqpvPTS2wRKWO+uAI3+OMt7Oy+Pfm4B7nHGnGdUMrQwxE87rwyNRo1E7EBYNEc3WF9RE+dMj16GLRSARDr6k58KEY+Hzrt8qToFpIFdALUDCvSJQms24oD1BOp6YsPsXyiQgOwJ2WOYNCNwkxnoYIlr50GlCswvQXLSTICpI65yLaG8DgtgX+2GDiI3u53aUCQHJvTPnQT0nRrlMtUm9ApMvROCjIMMLDXkH4v9NU8pUJilU+qvDnnPktQ0e1dzJtoO/VzzICibCdesQNRFeSb0ydI411TNuQ/ZV2g33qLrCVxoBPFr1F86/2MD0zVQ4Ru11KYSkFCz4vdGJeCQn/CFVz31G+h6OS/oZ/Y/BexPMlus//JsSGyk6PBImWLUVcZ/xXqvnz+fsEsx15tv3a0d5IdF0fLNtm++JPEmO9piiKKCKWYVjE2fzuk0bQuP/7mD0UdfveV0fntyrKaPOLxudegE1DQ2KdFRCjrTLfFee6kfc2RyDLnyCAVoxygKoWoTPHG18oWB1XjPzP8c2qrCReBxR8QkhH1vTLsZz4abuni6UASeMYb7CZPQ0eSEiP6PeUHwHg1oPva2XhJU16k+9LRMC9zKBYcouNzGsEPNNs52jEWoHvEN7gEUou5N5pOOP+p+wVJDJpnS3eUPsr3ZSYEbRDYE2cOM7ObLVp2h9yqWF9Et+CTifKosh3VvYOuNW9Xo9XQsOJYiaR6DrVKny6zrGrXopn/gi2lSeuROwpzzNc3Fguz/gbbhM1fB4S8ybfdRhiOiIt1mLtcyZWgoYIg/b6h3S5cKD2WEILL+nl3CYli X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a1f9bb7-68ef-4eb3-0f57-08dd7d5b5b46 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 02:55:48.6024 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uvR8lmKE5V4FddLEprubrmVSMrNvNYis8Wfhsf9iI6h/LMsVvq5JF1lJ7jW6jk+lbtDH2/N8/hc6cwP6gckphg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7935 X-Proofpoint-ORIG-GUID: zU0dvj8aHK4KzLTzppGGR74gi3Wdj8Et X-Authority-Analysis: v=2.4 cv=Wd0Ma1hX c=1 sm=1 tr=0 ts=68006db6 cx=c_pps a=Dwc0YCQp5x8Ajc78WMz93g==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=99BbB_j3FNS7aohJxzYA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: zU0dvj8aHK4KzLTzppGGR74gi3Wdj8Et 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-17_01,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504170020 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 ; Thu, 17 Apr 2025 02:55:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215030 If autogen.sh is run outside of a git repo, the find-version function always assumes that libassuan is a beta version and adds the suffix '-unknown' to the version number. Befor the fix: $ cat /usr/lib/pkgconfig/libassuan.pc [snip] Name: libassuan Description: IPC library for the GnuPG components Requires.private: gpg-error Version: 3.0.2-unknown Cflags: -I${includedir} [snip] After the fix: $ cat /usr/lib/pkgconfig/libassuan.pc [snip] Name: libassuan Description: IPC library for the GnuPG components Requires.private: gpg-error Version: 3.0.2 Cflags: -I${includedir} [snip] Signed-off-by: Yi Zhao --- ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++ .../libassuan/libassuan_3.0.2.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-support/libassuan/libassuan/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch diff --git a/meta/recipes-support/libassuan/libassuan/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch b/meta/recipes-support/libassuan/libassuan/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file mode 100644 index 0000000000..5aff687e97 --- /dev/null +++ b/meta/recipes-support/libassuan/libassuan/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch @@ -0,0 +1,35 @@ +From ecf05e7794edd56c6ff1cd7b14154e647dd0d787 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 15 Apr 2025 15:32:58 +0800 +Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number + +If autogen.sh is run outside of a git repo, the find-version function +always assumes that libassuan is a beta version and adds the suffix +'-unknown' to the version number. This should not work for users who use +tarball and re-run autoconf in build directory. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Yi Zhao +--- + autogen.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 0b08e8b..0c5e425 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -284,8 +284,8 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes +- tmp="-unknown" ++ beta=no ++ tmp="" + cid="0000000" + rev="0000000" + rvd="0" +-- +2.34.1 + diff --git a/meta/recipes-support/libassuan/libassuan_3.0.2.bb b/meta/recipes-support/libassuan/libassuan_3.0.2.bb index f0b7746284..e4e903366f 100644 --- a/meta/recipes-support/libassuan/libassuan_3.0.2.bb +++ b/meta/recipes-support/libassuan/libassuan_3.0.2.bb @@ -18,6 +18,7 @@ DEPENDS = "libgpg-error" UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ file://libassuan-add-pkgconfig-support.patch \ + file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch \ " SRC_URI[sha256sum] = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6" From patchwork Thu Apr 17 02:55:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 61457 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 59B10C369CC for ; Thu, 17 Apr 2025 02:55:54 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.195.1744858552535397032 for ; Wed, 16 Apr 2025 19:55:52 -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=6202e9a415=yi.zhao@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53H2ACnl016010 for ; Thu, 17 Apr 2025 02:55:51 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2047.outbound.protection.outlook.com [104.47.70.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 45ydd1npcv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Apr 2025 02:55:51 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=urcTdQLq0XHneD5f8F4KkVF+grq932vZVOJU5gQDafHMPUCo+8LdkGqawz4t06WP5BIOLXY9tZEku1Rs0UJ1eB70eLwVbCfmGrE5JlOICNUFTuQujdAtd95SOw6RRy1BEULII+Hcu948GRhghkxdgdunPkhQtT1mf0PHtQMVgixopREsmGPYQYhGC9k3/eNj/LyWpkq3Ca2F0R2vFtNMJcgnKGQrosTVoClGtrJDSu1VYk/5ocAFfzMSpYFBhnHFkKjr54F/Yx2fKf0SkEZT77MdhhGleHebyffnVykvDBV+nzfXmGRBB3rzN2Y2QvvOmC5IU/dqMtdZk1mz/S7hhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NrPzlXpCxxR0acO4pYTsgO8/78FO0/2DMZhNKzsbtdk=; b=MY2ZboEH9fDlwyNtoWKB0b2E0/JlLcLctHVx6/shYUhFgzwYru1AA1mT3PZv1arQ558hSPhaH2niMQWlTTI+l5wrXxH8uuf63/pjYMnktINGpOxYBivvkoqqA9BhAK4Sh2/5MgtP4tit7upNBsaX0lI1ucqJHASksSBUR8HN4H2NDz200iIIfP7CB/MMFlaOGQU9suhTFuVdBusWfzJ3Hplixs+UV2LqvVoDyP7QRTd0dW+3rmfCv+6ijeGYkx1lsdpZG83phTQw66NeC7ui7GQ1qRYp1ZohSbljRMkcfhG1Z6qzndb9KlBlAzE7YOI5tXVh4C6wpKbAPA7MgoetwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Thu, 17 Apr 2025 02:55:50 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%4]) with mapi id 15.20.8632.035; Thu, 17 Apr 2025 02:55:50 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 7/7] libksba: drop -unknown suffix from version number Date: Thu, 17 Apr 2025 10:55:32 +0800 Message-Id: <20250417025532.1363790-7-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250417025532.1363790-1-yi.zhao@windriver.com> References: <20250417025532.1363790-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0133.jpnprd01.prod.outlook.com (2603:1096:400:26d::14) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|IA0PR11MB7935:EE_ X-MS-Office365-Filtering-Correlation-Id: fcbaeef8-990c-4b31-c175-08dd7d5b5c12 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: SqQfKGf3UF2VMOYTMLon6AFMCAnDXqRDvNQQbKRS7vgExOZHAIcA1a5uhHH2IQXDL6NSsKrnEoOdtdE7F0W6ZQM4pcOmDdGKKMs81OvS1xALeKfBc3/gIamkmd/1ZHxiKW96dsmoc2K3vH3+n2kQwVgE7OBsLFFXMTlec/t5SJuDI3n8lsKEqRKs/xbBGKSELq/FPkaz2rB9pdsCSOLMhyT5DZX13gAtdCfCj30Ds8EhYm2ABetq7dFvHH5oFx13kPximEUZsLML46tLAp6v9xLmjbfiLUrF7LBdYs8aywKVawVyI6gWNvHJzN3Hdl9DNMG3vUBrPsUJ7CEEsiQN5cUut6kfI8cdcB2xe7omy21f71XfYrrLuYF8ZtPWxRr/CxF4GfeubkNPjW1BSassyoOsueS/z5pTtZodQwkFii0pFr2wdrLmW44mMqN5mgzIuAM9VCTv20I6EZx2DR47TvKw306k8wZ5Ca9HziYWEuiMXn4zRZsnpR2PR9K3xvjgkeQ75vc7Xk6+u7KSLfHiAVISYZY9WDgwrGEVt/l6futILG33VNPyM6lYHQneefSay+nIYTyypmcc7Jeu2ghrFtb2SLDA+In4PZ6SPmX6YlcClhmxz+SXrtOz4MQ22/IlLN8EF5oyooySg+FB0BCEs+Nos5W15e26fHmregtLhTBzGOUhJYS0y5FSiT11pUfQRs8dvp9G/xDbk/0Jx5c6UlMuzMcz/9z4t/ycLfodZsoXpcTr0cibnH8z8eYrWwnmndWsZ/hAsYix55oavxgWgGyllIMTgeSOv/zMXIp7qKWuuypCy6fOSSV2Hc2ERwApjazRSJJ6hlTJ3zG03bXIs8Z3/K4H6KeHS2yGJJVvAaWRhWMdM7dlUBvBgNOHt0lpwOQCt0EUELj98QwPSxVM0vqsRu9xhNOVo6qiOKsed2AvaMo75jSq6yQSEVz9J+kginouXIOH0+lhvELoXxJoY8RtBEq/HTcEvldyI/1J0POzfvcwhDvayN3efBAkV2gIzO4ajQw67+Njc0YYIE3MaoPQLZOZQHztjdIHUb/AqOo7S6kOo3Ni1sBeK3PqfpOEnO3NkeWVd2A4Ivfoi/8mtvKnVALIbj84WSWtGDGA6+QYCZcZ70PH9VE8eezThQzgN7D+Xij2RL3NRcgF7uwAOEzakz8s7+2AVeCnu7JDYjY3yhyfYGujMaanWO4KAw8B5Z289QBELAYDDxLm/bbv3rj7kOAvT9BJyBB7hZmOT+GSkYAgVyQb4QtBBr6I+kOJZ3CNL0VSljj54Nr+PiRaDK+kWbrhXCZbh2MOkFYCIuJHtPWnx3uktQH4PJN3NCd3axonydPwMPJKmUBp0CBK9JRPO0kRVSaesOOi3XlCW7Nylr/ORljO64rsMkoCd8oudIFm5keTbAKLD9pFsMklHwQXNvxFFfBV2L0pYqN3ObQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MV/B2ihs/aluoE7/i8NsWxWw03IMKbUHweTCCVLrrsMpWVPsJCbekUUSmybyzJTzEfEf4aVHGaX7v7GgyQv4cbmQqvoj9HzJxppW3pnHxfrdWw1XTv9bNndFE11FlPc0WlFwfNEg1fGMHYIDLBlRhBz8IW7PMI5NFu1twzbKeKjfjbCuyM/G3RNwgtI3aJsgP2bv9EfVG97CpL+z3vTzZB4oRhtoFixGr82YZgTW5PLSOWzlPGlitZydtDx2wk4jf3+LoDw6qLP7jd/orRtaxBM+loc7O4EeXbKwsdD8RSN94/8Qd9oolrm5+vjazXya3WmJhtAZ5w4Q5iImXUxurdawuxRZ7KU1Iq4IOSWRgL9eYFvVbEqT7hkOcmYpFsjAG6vpEnyJuZ0wmB4VAB0+nUH6uGf4/h/z2TOnAIqCYB0Xu3sZafvJLe3ckUCjuG6BEiBzbc+cGiX4MAkEF8odMB0HAYi9ia0GKoJFh3mRs1frnFKhqxOmmy7yyvnKOfUJcnvR7KJwo4t9cy+AY07e+7lvcApSQqdqlSu2oVU0ArHFs8ZqeXwQyld+vjoCCazGAnIaUVyhS3LizE0Uoh0ZGGlYTRK8l2TbMUdC5gHoF5Bts0SW/CXFS0rmE0vOgf86D/jBVRRKDfYhu0ssl1Bfs4Th8nSKBzIUn744YyTE7NizWAKlnEsMSSd/JRF36M9cGD7keIkLL2sqyk9/xfUU25fhu9TUqd9UMmIT+d04kaAPWaDugmR06ksTm0kEeQza6+NVuZHfGpku8sez337tr4j3Wway37A5fK4s6y4lf6GfBYIOrcTEx20raIe4Mb/mNYLPMHlkOBTVL014sl4HyLWI540uaWnxeL61ASpzk8mwx1piTaCY6WrknS6e+JsDAHFcDmZ4s3dNHiybILFsBjTaiBlpurp4uLIQ4rBaYSXcrweF/R8JRtoKYHIcq/qcSZ46HeeU00CdBAKDj8LD8crQNIK5gp03w5swPRDGy+bjiHQU9r2Jcu/Fshr4QtRugMxHB0RXvb7+OTq5YaGvJN5RQ3SCAdGuwRAfqgZR1apNJD9wblMRsSnkjf8ThrnqMlySHzS8H4hBdKJR9CsFt2ev/bWtz+cueg3pRhIQi/8cZzfuU/HoYthk/RnkWu3hMV7s0/8tLHUGBO0abeyxfxzu38OKTstP/HxRAjmmX7IbbShA8Sjmx5Z2nA4NzGPcyzCjTdQzOUmxYQ4jIUklwtCZTxnRbzLXfgN29yZrJ/80w4KNP5rrO8oU8UFr5o85XGVPG9DAUbyccc26w+MK0WAXkLEyyn5Etrr+Qa21Yqqm3DiB+T77ZYsSAZ1SiNPDTekvynPoy5RRCDju2u/JUjQPhto0ZWvj1ednompI24iPgxf8BTcwD/EboP+sV3sF2jEbiGW/sUThD/pk0H4adXJZyBn3tC7cT1+7YEKF5RbHTArsVBkrBYjOEkyAr2O9XHxANdZY+GhpfqQVDrDGVW17tCGWlxugYIaW1MxoLeqWDelVCG+H5H42IyB4Jgf3ZLp0mJrefuPiwf7/fj1pZtJyay3qMLJY+9a8TX8VUmi0av7/c8vPAf6reODfPDIK X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcbaeef8-990c-4b31-c175-08dd7d5b5c12 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2025 02:55:49.9176 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TiFGV04hgZfF920aUoGP1ATBuoy63HF5Ilql28ps8dVQF1Rn5g8lx4meXrfGXOsJuFgfkLdgkiMt6MM71rxltA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7935 X-Proofpoint-ORIG-GUID: Sl_X_a-qOwT7wcyeEyoPdqwvNrWvHGkB X-Proofpoint-GUID: Sl_X_a-qOwT7wcyeEyoPdqwvNrWvHGkB X-Authority-Analysis: v=2.4 cv=HecUTjE8 c=1 sm=1 tr=0 ts=68006db7 cx=c_pps a=l9lnEPKonMfu/vbXsUzXcw==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=99BbB_j3FNS7aohJxzYA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 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-17_01,2025-04-15_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 priorityscore=1501 spamscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 impostorscore=0 suspectscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502280000 definitions=main-2504170020 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 ; Thu, 17 Apr 2025 02:55:54 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/215031 If autogen.sh is run outside of a git repo, the find-version function always assumes that libksba is a beta version and adds the suffix '-unknown' to the version number. Befor the fix: $ cat /usr/lib/pkgconfig/ksba.pc [snip] Name: ksba Description: X.509 and CMS support library Requires: gpg-error Version: 1.6.7-unknown Cflags: -I${includedir} [snip] After the fix: $ cat /usr/lib/pkgconfig/ksba.pc [snip] Name: ksba Description: X.509 and CMS support library Requires: gpg-error Version: 1.6.7 Cflags: -I${includedir} [snip] Signed-off-by: Yi Zhao --- ...p-unknown-suffix-from-version-number.patch | 35 +++++++++++++++++++ meta/recipes-support/libksba/libksba_1.6.7.bb | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libksba/libksba/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch diff --git a/meta/recipes-support/libksba/libksba/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch b/meta/recipes-support/libksba/libksba/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch new file mode 100644 index 0000000000..39d50af837 --- /dev/null +++ b/meta/recipes-support/libksba/libksba/0001-autogen.sh-drop-unknown-suffix-from-version-number.patch @@ -0,0 +1,35 @@ +From 5837fbaa76e6959ea895dc118893fb60957012fc Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 15 Apr 2025 15:32:58 +0800 +Subject: [PATCH] autogen.sh: drop '-unknown' suffix from version number + +If autogen.sh is run outside of a git repo, the find-version function +always assumes that libksba is a beta version and adds the suffix +'-unknown' to the version number. This should not work for users who use +tarball and re-run autoconf in build directory. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Yi Zhao +--- + autogen.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index e6efe33..6acff4d 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -269,8 +269,8 @@ if [ "$myhost" = "find-version" ]; then + rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null))) + else + ingit=no +- beta=yes +- tmp="-unknown" ++ beta=no ++ tmp="" + rev="0000000" + rvd="0" + fi +-- +2.34.1 + diff --git a/meta/recipes-support/libksba/libksba_1.6.7.bb b/meta/recipes-support/libksba/libksba_1.6.7.bb index b7a9fc4050..28ce97ac6a 100644 --- a/meta/recipes-support/libksba/libksba_1.6.7.bb +++ b/meta/recipes-support/libksba/libksba_1.6.7.bb @@ -22,7 +22,8 @@ inherit autotools binconfig-disabled pkgconfig texinfo UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://ksba-add-pkgconfig-support.patch" + file://ksba-add-pkgconfig-support.patch \ + file://0001-autogen.sh-drop-unknown-suffix-from-version-number.patch" SRC_URI[sha256sum] = "cf72510b8ebb4eb6693eef765749d83677a03c79291a311040a5bfd79baab763"