From patchwork Tue Jun 24 10:41:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65562 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 D280DC7EE32 for ; Tue, 24 Jun 2025 10:42:17 +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.5338.1750761734507383699 for ; Tue, 24 Jun 2025 03:42:14 -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=827047d704=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55O3GYFB028307 for ; Tue, 24 Jun 2025 03:42:14 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2045.outbound.protection.outlook.com [40.107.237.45]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dv8mjp8p-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 03:42:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XPtZ2P+t3nbJMOdBCjTdQoXXxBtRlYgUzuDIJr3pGr8PXrV3H8sZoPDcZnWwJ88YwAkeDcADnTAployviDh7dNaRdnBz9wR3RCcgNMJ2Gzx5h9aeEgu6m6yRbBur0WwAk/NlaTOFf/q1AGklSaX9ZRi/xw2GOujnHQenqfgtYobIuzjHLireeXwufIw4TSgJbn+fYOXms4kG+s3PB0x8vLmdqQuxxRuCNGLOEqpg8gjLOal5C/srTG1RJYbD0qoLiwsj2q6x50BoX/FpUZo8IHH8jul4EDoswrulTdbiSKLzdI6jcpRZg4iVPKMkhqRdLxqs0flh/PPvUa2DtTcqUw== 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=j29gOwREQsRkhjkvK34H0EnBY/vsaBEUYCx752SNfSc=; b=YgpImf4oNY6vZmz2EB5nlJVgfjhD2+aiHgf2zhs23yQdDAQQiAyhuYz+fvZMBNYwbe28wPtwZhdAk0wJzEAXwOhW88fhD+Ro0ODwvfquotQZh1r/p1jF/9jS8tlXJvQQJ2FE+NG8xmIatYS8U5hlnmgiNga/SE5qYn1AS6GxttfguhZRZrl0PtfvbwSXSaFeiQr8yL7sFgUn1XrhP2+3OyE5CvWNEy7qiCNO8qLHWBbBv6wx1ylJQWOjwMBRzl/NHVyu7woiX+6ZJw0zXFD2HieQ7YlMVATL9gEDEwzN9APG3cO6K6hrWoPX4JzIZgJp5ui9/4cFs5Wy7Uk4TxwEog== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:11 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:11 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/8] libgpg-error: drop -unknown suffix from version number Date: Tue, 24 Jun 2025 18:41:48 +0800 Message-Id: <20250624104155.559827-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: daf79ad9-8e30-48ed-4e71-08ddb30bc6b1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: qffzJBLUt56My0dcthEUMIBoO9HXzoWFE/8P6mXheUQ6d87M8MaXIm9tsZkWHaRZ3/nfgti1gPwG1P/XCFd3kCBCQOs3In8pKOGlUyKnJUGfc4OEYz+h7y+EcyIg3NHL3iNgefdxIFinpb+8bJNaZSP3UmCqMvN7VZG6HANilsVcGXIq3kwAZTHuiJUFn9QoiFaqVKA9pPW+b6RU+jAsgRssH7Y3nHGjJkl6A/nwINMVWuqrLUnil+QvGFzVGBlicPkmpRsUS2czweiJ7cwJVuKeJlXGr+EALJqQWhglAWOi+URxzCZIls6BIgZuG4T2ZiOaQkrwRkKNKBiJH43BJhcDxoFNNLpwYw+l/60akxeVD/78eaqFYYxoPi+AO+8XvL0wYNpJidhc7quAaCLdNMpr+VAKRSnR6DURgAvHMTRsNgXJ9DhPHCYC6KsFUuD3LISNw5NcKkLOOz5KdfMPwW7yO8erElxqC2UV10TDXtzDbOM8jxLQceuqNH4hIDVrIRf0Me3Cx0Drg8ZmpbGx0le7RgkCAFQ6WN5Tj9BVLgjKvBe/PkPwtBTNGHK9kSNuUQ9cJeYTz4FDov2eXnrE2OR8xn471sQPCHlLIQ9yThtG8IuRrUjdB+3k/K7fwfdUu0S7L/vROiFBtRzmZYI1398lPQcVkcgMPwTmJoSYMkY0hkWti6+l+47rzSJa/HxzSC4dgLh3075sHuPfiiFIiG4TeIDoy69rty0UjBUntodeb18Is0zuaFNdmumdi3wIPB61K2shbsCYFLCayXzkmuD7dCiyO0kdragayPQ38L626RcDdhFCR2ofIABtxRt9pdATv886d5omyOUWg2rpZW3BNNxSYvw8fAefOreFYsscukYoI5JsVZpKCUwXN8cHGCIwsfsNfjr18dyAXV+55Ib5WYtoDyW+70q2nQd48diF/dRwbSFUWxW80Ytlg36P9NRVeLNfFii2gqQSIv5RCp8kLIMKu0W6IBjiIBAf+X1phYMjOPa1ZBheDwcaZfyQYfCEooHFi0jZJe7n2Ptkl3ERYWilU3an65wAoi0zmGOlOVoWO34J27LpYVgAJl/nX29xKvTG9ZiiEJ/iDV/Uj1E8//9wE9d6Hq6zLLTCflSDTk6RpV5yLjslzxGPdIfHiRtYDRbF8ka3r4nRFh2wvXogv4yTbEEbEv7QfqKrrJzCo+4yAX2eG5ffykIMTOIAPersYKkSAacwz4B83oSFMA/dlerNHuJRcSIa/g6Z68S13DxBABkiMJfhb7GkBWfeGUZCBmNYDIX/jBnIYCdUxRQ1y+Z0bY9V0XGR8RkvX6bC+xHUXTFLEGxxFzMnBTpgWbgUmrKLEdFclRS0fz5VB6jXTHrQlwMizxOc9gTDGS1rTZjgb1TBXTKRIOHA2xztX/02Jhk9KTORayjrmkiuks0eBS3D4pE1H3pOG7c08DM= 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LOu2WLUoms0B7isMo1b67E7YLbfhzHldHeUw5/L25/wABGJ2uL7f2H6WllTPTzZff+CqEBZhE/pd3A0MyjFFYg0+48/3g1WEaGoKxcPWspcEQfYgAPyFOTqwMWXBcVb8gGWQqe1jAFbmcTJHvuwBtBtM4cV/qNATkG6+/qEQIDOcNp0MFq7UQG81CnLp6sX9GMeVRpaqHPooLCZFOYEKyhEKaPqncB9wda9f3KOr8lnAdf/9pf5csU27MtWYgyW3vzjUrB2NJraft50hKVIGwEmu1F5quMkpOEV9nZ+wpJKMBMt9IJkKskuUYPUH4EXiGNR42SQ+dOdImINPGoaFSSS/pLcuOjbJD9BV1bT37zrJGBNbZos3yxYeVjiB8uCLcy6nMzc5D8ABWCkU9xjLfojkKgPgaVPkwFzrVxNfuuqz7Ym2qOEVKB9FhLikTBefvVX+H42e0CwKzX/RJYrqBmWZK2J6Y0h1azRWFNQ4L9Uhk/uhEUdZA0fEcIG0+9nnmZqIh2e9PTjKhX8cztL1kckMPhqN9OAlm9S7K1QNXf1IsIb3dDJ5Zs5k/d5Hx65UXxfufNmoVRjvR9Hj3wW9G+MGlcy8Sclg9V+xsot2tuMilTNx1BozoqFvdeicc9VHI2zWrdK1qUAIVmzNQKdNsOJri/0ngbbPb8Ifv08xIDJbeiPYx0bzcKqmb/rixJIQ9BA5vEmZHj0/vBLd/mcjfhg+L75euT+ufQ92r5qEZ6mYCc86sgb8ueVJ03mGHXxatM/VzhpnT/SYBnRXtHYnP5eDvQmCwNm08Teg61n/8CuJcqC7//VjVRirFf+o8D/U7JN8DrK4GK8DfHVEzzqiNvA30k+I+tLiZ/blX+jLRdiF2d2FGDitEonYt1JTKVNqsmTDE8xp4xVlIuOq5nLmY3aGc6KbjBdBJjJPpB5VVdEgSLSYIFOcYYcqemAgMGK7Gwud9PFb3quNDlq0Y65WZsEVvHHvHK20zRUtIT/YTd1S6jAd7gg90/yMAWTy12Z5Kf78I2ZGIRs4JWDkZ4ksLY9TC9Xqo0CbITPNo/3V1WhUeYVxcK53NRGhE2elVWBDXPAYET20M3+qsgm9QKRsI482cSKDtzy3BphuShsL3FmrPIAdkl1jCmGqlcaKM/PuFEmJYVcAG8QyShyNtj/BbNSuhH3chQIDD2mfqBwIP9qCSM6/sgHPi+VqWYgxckijKNSd6d+MdsuPRHOvdGbkKG9sAFka2PvpqRk4kjlCnVh9ICuoUDPTyRNHeMb0+UnUHYadh5av6r548kcYoc/qipNEkUh7h6sC37sp8EzJvMYbZ7s9kpR7CznSDXI2u1ji2DJJIWOPl4ozGHMTREquOobpzG1lBbtWXij+uUaxE9A/H6Pgup21fcU4fPxNVPnsfAKTUpnWDHezpa9aVNH1N/Nat4VixBuUJb2tslaEdevF8rb2byQu+TfrxfHbXXciHsIabXVXrHpQCDfU0h3orbSah99+t85jmOKZ8jN3LLJ0Zcx9B3O0SSAmb98hw5TmQAt3b7B2BrBBxj39pPsvY9ouOWXs6IXfC+jjPWzD2J/IRcIBsaf6rgg22dzNDXfx X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: daf79ad9-8e30-48ed-4e71-08ddb30bc6b1 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:11.7799 (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: pUrNOV3UbPCmErBLWa97eO8Kt+REAi+RbYvRdGI3jnJ5saiTplAp2vW1Ih2SJ8VjWyF/pT0yy7LHG5f+tRwHHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfX/UD8KwrMDRr6 FEwh5s83NJoDg+8WMXPFSizgHdPslFLkba0YkgauxgsTvCB7O8yCYqYcWLCRfJeMW2FTNu/zpVE we3iBMjJQpghe5cyc+uztcbvMyXdLsapaIVBmvU0udqlU3SX2h1CAnDvjNJ10C9Z529ZVIopxSP VYaz8qtASGf8ocaanKJucLOLSANrnugnISKgSzfiuK+aOeOwvRA+clT/ZLbuCK9JXgcDl28SAJy /fg2YOhr/jkpbBN7AvJCsoW/AUMZ/j/QHU/pSavUagpcVt3bonkNGKMRP5V6UmI0IeTR/QMCo1l N24GQC/VR9vh4lW7soIgGQ6BocTlWH4GzwDWgizjil3FgV4PmxdeKP7XR/P//7VElDGAQf2Zr96 chwfgl/IoIvz2teNNVpaFcNe1OLmMFaezjvIqLL3cF7HMbrx6S2dxcWsA+2ru2k9rAcSfUxw X-Authority-Analysis: v=2.4 cv=MeNsu4/f c=1 sm=1 tr=0 ts=685a8105 cx=c_pps a=EDI2sMUdhBp/6Fwy26P2Vw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=sODZU1DNDF4EVHEcULQA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: iwQ45qfJoXqF7groCvkYw5INBW2YhkdU X-Proofpoint-ORIG-GUID: iwQ45qfJoXqF7groCvkYw5INBW2YhkdU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 spamscore=0 bulkscore=0 phishscore=0 adultscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219242 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.55.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.55.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb index 842f54b0ff..f06b46ab50 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.55.bb @@ -16,6 +16,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 Tue Jun 24 10:41:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65561 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 E03B3C7EE33 for ; Tue, 24 Jun 2025 10:42:17 +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.5514.1750761735058332504 for ; Tue, 24 Jun 2025 03:42:15 -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=827047d704=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55O3GYFC028307 for ; Tue, 24 Jun 2025 03:42:14 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2045.outbound.protection.outlook.com [40.107.237.45]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dv8mjp8p-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 03:42:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SBx0xOg36/+eotuQRPbu2O387PE3n8lKhXT6ZYB9I3TGxNWkKrYi8qLiD36PX7ILlgJ4Ryx3E2n+HFUv0NIfZsPNEw6ATeJhV/m4tIiJ8OcXHKJFhTBKeVir8lTBsY64pJ/xkNYdNyqUMtC7ryziZs3eCEiqBccO/V8tDanNNL2wkrwa9GiRz7O72uGEu0gzQmxkw9DRLPwDog3cG3oB6PK0S1eMNc/aR76cAVCsP2yuyTDc44dZFGK4l2LcVIGpAS5LlgmibOLE7D0uYRBfAy4WBcnGVsxv47z7jXcqw1zMwQUoj5hOWWb0fbKAmDGJM6aOkqQBFDCNpQLg+W3UFA== 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=E1HjL9fMHdXAH7PTZMw45sh7DVtxEoEUgywbYOPoDto9Fl4L6BDI118BbWvBBUJA3WvzEXZfeDYbCA0Q9u30Z0YD9uuDE9zs54NSMl6HeP6CNtEMgbJrvRjyi01nOIydhypytGxxr5RBV6cbdbS8YR69ewDPedTp0t4fYkBgcrAPXMvtCqvwKnhr6Mpi+ZhR0r0xqQHWKnj4Ltz4SvwF2df/V4KDXv881RARW+5R21HNZPt0SH6KTTI0XuwCJ04CLWLyWdrS69xoQwUTYOmg+92AAQJ6+r30aPwc7piGow7hR3p8YrHaHDI70OQ3slFH/R4qZu55Yam3xJIZ8KKF/Q== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:13 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:13 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/8] pinentry: drop -unknown suffix from version number Date: Tue, 24 Jun 2025 18:41:49 +0800 Message-Id: <20250624104155.559827-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a96a1b5-af44-456f-69f3-08ddb30bc764 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: GjLorogGb/F8y+yhH3Ot4J8LLhrZvLWTtainYwZF2/9GcOB1QQ4/UjrTsldsILoyg07VGMFO6UdAfoRdZKJG2LDfSLeXQBcieLbG69mP6XiMd82GQrGByjwnGFBkuArYsuzmFfGK0lhmo9XoadS5pG+chxYcd8jAecM04siukcO533in0boIaiQnm19/n2N2JJ5VG6BzvL5Zl7B8ZtyOB983bffJdYB3Ai9Y/k4/simQkCQq8Zuo/NEvO9VRodFy1B8hUY6zSvgrSGxDWHi0oY71HesEMyc9FgDiCXl0Coazp9A6U9qptEuinZkNIEYeQz8P0cGrhf9d2hsmB46WgIaF8Xb1y2Su8WUZygd+8sUSHcEaRZ7Jr+SghSE83Si1XqvaqQrwytcqdiI5RiSPorPfNzry2jmWSwYpJlR7uPpuhrBz5tM2n+x3tDEVY7Hjq+AnBiVf7Q8uLBjn6BR4hULIWJkovttS/OPvw3pGCE1YZ00h0X5TPb51mBQ83zXPGVEyhm7MvccTSDbhncHr/jOQmwt9vKYaFY/RSlUTUrKlw0eDfIqA4cK9jMAbqCa7Jg+iL+snoFax1mOHAgfwH4Z55CmyL143tP77cK9MM+Ay9Ub6w+8nV7xRd/VQx2oOQwMWR+QBcUkfVtlLCjzqop/FphsXjLqh4qR4KRQ3+2SnH+H/AjB6jcwmKp6wxvJd+0TGaqtglkAsOJSZa0t+3RrrVHzKhjk9ihtHH8rhy8XhRWzKV9t5mgvRYEO+JFqNWTthQPWOqYa8P5YF/59WhnA9WROOPzGuWPEOtdm6l041p/y4lfoHlFojLhD9KWUAlwkrZNTwtbnfhuzvLLEmIpum5LJzU6DDMJeYBveP8PIltEdmrhuPu5mQ/AOLQ9lK4e7XZ08PLGsS9hSrmquz5A0n8oYXM+zghxPFna5NJLCgpFCOEY0jBvBiMR1TqIqnJPGfnDJt2TEhL+v2emBmMX90nK5793Ew+D77rdoZOhqujSdHuKLg2WWD8lkGQJuXvLPybb6G6WF49OylOvt2SrJ1sq0WS6dPXtpp57GqnyJZZBLhd/Rfz8XCbT6TO7Da1PPnpMyOOHsGudGwE9tlxaE1/sDfdi2tUeIwDxB3cI8Kw+n9DTRqnq/NdE6g0bLWzO7DK9zdioWjdPv0BTzqzVw11QjTzOZnO4pgUXOzMexKispJ4JioJ0TF9gNWycPQbnoIv2nITyQQxu/dFAZ2VCzAty0mnmnL625Cl9e67610tGBviz6xFEcxTPCz86CsxT87Kn5m56e2A3K5o4tjSXf5Kfq81Og8XSfCYnOHRsXqb/NXrOfWZ9vElc14BUYpu1eaWJPiIzUb0ejriKoybcV8LzGUSB8IMjR1mP14kTN6YaGy7+ae4WQpBNoJsdSTfjxEveDHHgS+ALFxunTCbRBw12MBQGGwfeezDU5lUWQ= 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8X00BkeTtW0HfLlootE/ZqObWIC5Er/jcqwTl9AXiKhPGOYU+/EpSCjPchheeAn4TTgmB9oXL8SEf6DoVvZfZs7n00jTkaXIu2r92r3yM9PNvOFachzLrkYBZNUvStILUYqyWimSynYEedrYJ/sExzW/RQNwod0R+xFNJdSbmISgO3Kwyjd6DqfSJMjl5xfHyK9VkHjD0gIPBY0hYfOU1XulxEsBBxA6yFw+pdsNgWSVMZr5UOJezZs1Mb0H0m04FTCJm53GlcYBrjQCREqW2RAaX6pMdBZrH/kSlQLmpj3vMHi6NuhsKF3Z6jOTR1YCBiCIPZSj5O9Ak5/s0U6D6yfsvOmq7iH/vkCC4YKdEmIx6yVW4h5aXMH7Wcz3iLRwjjYZFmA0sVXl8pRoLUxk0sD+9/uL8zz+07PsQ3KR8Ntt0aqDe+5b8Q7WZv/hlI/n6a2S4XDdXxUxTFCzEH5QHkEIoEcmt69Q85vQhhLNem/B9TMzIXn/KLO3qn/M+rEk5JObrf7NqDHo1Y8H83d4puZL4RYns8FchrMynIWh0xr3/rPNPNIHe8l0Sra9abOexB1BSld7EnllCqrmLzsP2h7yhtA2YsLzLtvsvZnKzN28Kk/ef63+T+ElAbM94AGff2gdmblJ3fyBS/JMr9qGXQqlK7ifU7cUyNoP3GFDY+poV2iyloujnG0iHcAfKd8EHGLp3YxhmFk8TP1+RS00/6xNBYYoPqmA+/srDj6hHKuKYidGU5n5+BZdks82yllpeIjjY20h0mKA7x9EX5LepfIxJI/35FvxQtrp3EQnJ+xvel1Wd3LhRtkZGH/bBo6wPRD2bWaOiLTSwkpCJtnlmZRLyut0/ip4rfmx3HxZsFEyfB3jg/gPC3Bdim4NnFBCmioXUA1T/4dEDnTggALtnMItNg6GVmWchFJGMEm4pVyBkE5/zyd2TJD1etDEv8N/CR2eravHmlHsghMpGOcPm4auD/Np1pp9zn5qFqNmcjSkhDg5EbYhuPgpN6zqK6bPI+fIrGDpc5ibfbOC8Be7o556/oYROtHL5tDmXg2uLJCPlhALFdaWWWFtnQnxAdbbDZPf0qQoXyRsgRZz6SHc2dF7ziVeXpkgx2KgMECcRjLw0dY8cuzg8zTUfbU5U+ZXBdz4LcaiAAl+3OLtEZGI6bZ2gh7/p4zmgSHgQKTTzgc100aTyAAlvn1vu9XR1QqC+n5Lfyi4x9NkIWezNzHqEWuvF/Lrzmxo5bj8g4dUQ2pNr0hFPG1SNOjiKJmv1DJy2QPHVgiMVfN+6eeCmOiN7xXpj4mp3NA74sttls11pcrF283l68htIs09YWNvnhhU2uFafSGBrQBegqEc8DRcYhPMxyu9lkcuJKUVRlqdHDIzkhEAahU+EXkFFCjanC7pvx7gUK8GePx7u/E74NY0QpyrcU4ZJII8LZHsKvXXz0bX7OpLPCXVuTJwf6LBWic8G1wSxRYaklHt/aY/g/gv0zss++wiyoQQTCwdZ5lvaK4i5Zpxj5RFMXHfRTzRYpIwMvRB6ydbPNZj5aq98j5SLqBFUJoU8y7zSQ1lobL6Ktydqa8C7endy8C3/SA2lSpB X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a96a1b5-af44-456f-69f3-08ddb30bc764 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:12.9718 (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: QQu2UeTmUmzZ8u3Gz7wQ0evjTaM7AqGfmmxI5jZjJn7ysIGP+dp5v6EfpzFi4edtRXkzQtwvIlzlDJ3n0VIVeA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfX0lSQqFlwTFLv 5sUO1U3GzKtvIcK6K0WEYpogeWMgInd0roBWbu/t2vmiS0kHnSlPA+3dmgNS4Hgh2JcoH7TPbwJ adpuexDUhYQvhl6bCPNYUfP08t1itYWTFtnRHcXyINgg9aiDfliKnDxq2LOXB7N/eBHG3cjkZut ADQcqZVJNkGQCSGZHi6SSJ0N8StK+1VEu0RzPgyvRZ6HPsLV8yz+AsAhDyu/ULTUA9TQjfY5J+i 8WUVpyxZIWgMVv9TbEvTIqnoJSOLYbk4JwaS9us4uxGpjKJ6Gov+Yqj0Y5HjoYryJCCMzWiOWiE uoEARFuobR7PIqYrNDsZ3GutHa3lH0iuUx5805/w3AXEPW+YBPQNVVVbboRM4mK3BslX5GVYHgQ 7X0lyrNHHa01bAIlj4Gp3fslz1+PO6wjxokSfH4xvZ3IMgccwVrVnYmQpUU8825EftB9I5DM X-Authority-Analysis: v=2.4 cv=MeNsu4/f c=1 sm=1 tr=0 ts=685a8106 cx=c_pps a=EDI2sMUdhBp/6Fwy26P2Vw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=XZe7PhnZs3Yj-w9OOncA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: jomsM4_V5YWe3aWPFI25XxIrGUoA3wkK X-Proofpoint-ORIG-GUID: jomsM4_V5YWe3aWPFI25XxIrGUoA3wkK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 spamscore=0 bulkscore=0 phishscore=0 adultscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219243 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 Tue Jun 24 10:41:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65560 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 E3A48C7EE39 for ; Tue, 24 Jun 2025 10:42:17 +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.5339.1750761735698185660 for ; Tue, 24 Jun 2025 03:42:15 -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=827047d704=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55O3GYFD028307 for ; Tue, 24 Jun 2025 03:42:15 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2045.outbound.protection.outlook.com [40.107.237.45]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dv8mjp8p-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 03:42:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BCXX9Y13f0s3+bi7u2dey6gRAybpCGWurwkQ8qXcvmlKod5PdLVN7ikpOYskxmogbV3oUS3SEOGL2rWGj/12RmBiLCTS8TK5STXljPaMD3Hu5jwrgXoUqZVPi2zXxzzIXNdfS5RjQFmWKtm5Nym9WgotehG0vIJX+Ep9n/eMwMPwBLGLvAQN3rGW9sKdacTgi7PQZJmW0vtOOhKAJgleZxxJcuDc/KzjWT813uVY2lEA6oSk9axxE7hxpPdnYSxYwJVKWxrhFwHTPWx1JE+cMXSBOIE2HxAi98fV2v7D5dD7BBahslxwoHv4xHxH68gEq6nYfZb+8tna1tvZCPVOqA== 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=ndbIy2OGYcuhC/JByVB5tpW+P4jwyqikik263hLbXZI=; b=j4SPgFhnjWkEPAw5WC/v1oBWdtJ9HFRfY4DEsw0kQ0scyL1Fu21p9U7jnLQscyH6CtG3BLiKAOhneyPsHImeapgWDYVoSJbPgNAsp3ELHA5V8JmAqqKB7+LZf8XPnhsnVIu/9N0TMzff4r/1eE0WCuztdnaezaeU74pwX8WiyDsFqlINsmKIrNxVv0YfvVfuCH0siZWH/smOOK/slmAYGHgrAw1nCmPh+ss+c0ehd+kCUida5jQGs/mGdfPI+5t0fZLUUi1CRIhsJnoIJ8vGTSatS3B9diQItD43qVF1cT8LDoeEw70qRRv3ty9QjUO4/UN40bqJb2hNLp/AYccQ2g== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:14 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:14 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/8] libgcrypt: drop -unknown suffix from version number Date: Tue, 24 Jun 2025 18:41:50 +0800 Message-Id: <20250624104155.559827-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: 79704863-6ff3-4ba8-42b2-08ddb30bc81b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 2aIch9lPpiRLWPnawveI4K2is0MddEpDuGmfcO/ECMep9VGR5jtO0dvPzm6YW0LvI8TCDu3ThWmmPQ3r1nrGf5SqhmDI+0safF8tIEVixOXBlqATs1UeD0jNa5F23bcijJIDyy209rHzqekI2DchvXUnw5Bi32ax/CcyaFs2nPH2ZqAAqRaqPeMLx3pQLtP4zt+N8pJ+z9NGpjKNyD+tzL2nV0X0cqxNZMAcMUBGPhdqJfFUX786kUBxMRmmD+tBWylfXt6D8cg3fYuF/EauAFW6S14+pNYjC5wvV+yPsQylFwf1k9gHMfcpXNrVZO/RhCUS3YU86gannh7fLTzUstAFit1zN0zKCCY2NhrEViYyeuaCC29/pNJhEJszGCjEMqp4bqLcTs+aLsylRCL4TtayYJOeZf8cdvjCE5t+xNseWkJkpLvQmYJY6NFamLTZ087s2yhi20jk80VJISiYoyL0/JXMRO5CfzVSP8e4a3GzbbSBCvR9gVWDNiYd8jeVuNNYnUSpCbMAYQaYYiaHFa/76OlObCnuRep8Z8qRbmvcqZD6geWRQK9khqNgtimD/uN7AhY8tj19NqVY0+FQZ0J7iKvm7h7G+IIjqS3ZQJTbG110A0yHP/w/SWwFoZGjBMZFvGU0ONq3p0ORTsG3/HmXRHoBe/HCoZ6YbVNjOEbod80mZ/C1fTpHw1dgIQoQAkoqfirnLk6wmP/wm3X3jGicLm8C/sHSH11fBmgK6QbmsXSQ9bvk0hCOOn5EJwrYq2jrmq3MrSPvxds9faMBiMIZ0UMyAYSZQ1IEpi+R65X9emEASgTExMcaEq7WBpzvWvxocijwlFinzHPvls5n/FH55YzF4VVoYW5EN6JIC0yMLnHGlg8c7cxWqXYqTl7aCvhwoo99N0U7EfFoHHEI3LWBZgYfVVWL8YLzHCLROX3H7gQS+Nf31mIUcEI9locIUvPSWpaYbZNykh6HjZG4i16GzFKNs065HIzt456bKESQ7UC/2D5r1/nPp6UdZvyFy8PQa/IMA1jlJDHiBzlePa9g21WjcclWRRaGjgkPxiWNQu1yTv5a7jyWMALNhSlXiB7EXq+4nJbbtzdxaet1kyJGCHSDtf092nFgxVIuYgBN4a5TSVEe0twscQlYhktms1gNzf21tuLID0E7a//KW2ZqRT9/iWMc5ChCPLAPJoEYnI+32JlM8bF9uXZ/U5TG12Xovo4s25R+1mFnxRlasyfXJcamVlZUuZGFOP1Y7fhdDQgDG5x2J4OMAI+YcrlNB4sEh9H/lPiPrx/J5nnhE239lAhwxVtTCjliA7idWRQPPlt4913n6BRNN1EjJvXzk7GXRjT8RPI5HARJ/abV8M0Ttlq31By4FKO5qIB/8FNW9ybO0cnAlBzYpMwsm5s9IlbhI+eFxC9Fvl9YmQnB3RP+oOwCHMeBmobH367OV/6oowdZJFA9SExb8AuiVEUEMkIUtT8Nr6M2pYA7yo/c9A== 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uGEV0nM7gK9Oxf1rv4/8VOiDuIPNrcGOZyP9SlJVTvtDcKIlvkPhmOjnsxRY4SGCZ741kTDV+70eHsRatFH0WePr7AVAwE8gmUYijI3XuI2YkpWyuVE5fqgkOQ/qmqmGO/wFhk+uVUpQlwg9ZeV6EBDjZbu4ruVMhKHl8G1LY30BAU2guj4StRMyfxLU0yZUwIC1JnZvkE9mpjK3No762XOYUiDsLEVpissplIggbh9RGmYryB2gVw0oU6FzQTVPxu/o7hZ2CMJadkgFIGIXV7u175HuNS+w8GCXvpoWGWrHwGUszRYFLTSkQYVl+QF3RS2+//sdtMF57sYCEm8GUtFDazU71UIN0bIhXXBqRhqDXvVIvmI/rGb1DVD54rZmxVs2DBMBHm394iXSWiVTDRAnb4cmi70ALXBGmar6jMY0I3BcVlsosDpZRgex5SsZImX0RUNv19ueU3NejQ5PaxzW7buEGE/nB5jeb9vQMYeS0T1A5P3JDPH2V5mDHztZbY+n/AQaVnDXwcZBQhgjcM5S4LxIZrbpyRz01TnvQdzYHt/VWukS9L+s7ShA7pBL8dyhxzAE2vuOEFbMRybWgd7NORmRFV99Y6bIOGY93cVmQLlDkENS+RnJ3d03HukoCqQAsea/0XTpHtDAfxpIGFZ+nGyMQS1MBiSbf0fEQ6PGZn3DB5+8nHTHro60LElgY6+dbOIDRaKL1syBjg2ECZaQTBs1+mgxzEadP7srTlkKff6l+dkQ9PN84QrIlV+i9KBHbQDoOxmufpHDEBQljDp7pbNt+zBL/6OJJgJtENfwGpOOt89R7U0vkHVdqr9thWQI0sfBEY8cjHV6/SUCcP/9J6SBHuVdGm4Ef3co7z8rHDZmmSwK/9Lh56O2F7fpDgt/zBIlHDHE61n0XbPIjp217BOonH9VWORGVZbz+u+CerT5WwZ5cE3bTb1Hx/N1TvIKPprAAIlozP9NN+JYFVc5M9RZQkUTzCSt1WXnUpKH4hn2wLRWSiD5prwxTYpVX41QQxApLBYBe4z1YuZg3xa+8xZO8Qq3dSRl/kr4utexu2yOTBpcnfHsImnRnmWF2yIQfr/C4tdtL2MTjqNNfHb1+xVQHe9UdD/Aux7s+BvPGBfw+tGHXgovI/9+yj/OtfsFFiw9PHhXo3HIIulCQiXA9Sj4GtVnldial8Medtz/E0LHfZRivsQvbxk7/GReGSxH99WIsteWXTWgyj6ObAErM9GIve1gYxiR85FHtmaxL8otIEyhGtGNChDQ7SWMa/tz9ZgUgomiX8Fy1JP/YpV4Cmgv4smQj52Ltxywr+4XHAoUDTi1bqU6dVTBh7yJvRdKRD8URDldS+2G7EGOZFPPftVstggtwp8oyJ8m5XB+QRGPBktFKo1ou22aoQC9ooL2cEBDyb/CinfBGVzecb6g4HYWV3FF+Dy5gRxiDXRsQDdjC8CtEEC2F3oFL+ywzjh3kr6VLp5DFJ02Sov95eRAufTw5ZQ2vZPFeNlSlGlFnb1+LakB2dqOynrrVVNarXUij7tHcoEsY/ZyZlisjyrXVEEWQ+9+YL78P/Jlhx9GuaY3KXlKDGWK0pse8R3a X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79704863-6ff3-4ba8-42b2-08ddb30bc81b X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:14.1422 (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: DjKtcpZqerO6IjApGerR4v77Ua+kSocDBqg5nPpqN8cTfKzn80wkJ9jW2DMq+6c/1UIALKwaQWGhtcWHNg+ucw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfXyTf4ejbgXJDr aTq5MvIZFf6ITboj34Hpx1NGRJHv/y/w+ZHaUiS/ds6tq+8Wrh3klGrAw0Q3xeq7dtIpSwfqdYo JFovJopMsVdRNzOY3ZW+f9qFHOAGoSqxhMxcngP1eKSBBJ8MefRZ1xFFCHDwxsY0LyZyBV5RUAZ 64Pix47fRSknBCO8NW+wu+EE6ZcwcUB6Fli42B8JQjS5gF6r4aBCITMYJzTClfvwFvsn1Ydxa1n f+JtQX+biFvJfuxlZNIBNBCkkqFgk3+Ng+YqeG05+F+UYA3kOQqE5D4QNMiYJmvwyIVoV+KJYjt S4mYIMSa6/DXmskidEG+HBwt5T2bK/Drk79o/hgiwo7eZsYUd1dzZ9GA8mT3T4tzmjgHH10RccG c7vvBCUbkg9/TmsR4MKlt0nJfk0GOPmQmlek8o65kk+fxaUKwgEpGuTiEgWazUqx/yYdcDGO X-Authority-Analysis: v=2.4 cv=MeNsu4/f c=1 sm=1 tr=0 ts=685a8107 cx=c_pps a=EDI2sMUdhBp/6Fwy26P2Vw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=t7CeM3EgAAAA:8 a=bggujf6qjDlRfYmNhBoA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: YOGRaZGnGoOpi6Pr2HmTlb95pUC7Mxpq X-Proofpoint-ORIG-GUID: YOGRaZGnGoOpi6Pr2HmTlb95pUC7Mxpq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 mlxscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 spamscore=0 bulkscore=0 phishscore=0 adultscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219244 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.1.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.1.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb index 5574e8c821..0857b5024f 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb @@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ file://0001-tests-Fix-link-errors-for-t-thread-local.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] = "24e91c9123a46c54e8371f3a3a2502f1198f2893fbfbf59af95bc1c21499b00e" From patchwork Tue Jun 24 10:41:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65559 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 D1B2BC77B7C for ; Tue, 24 Jun 2025 10:42:17 +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.5515.1750761737571816843 for ; Tue, 24 Jun 2025 03:42:17 -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=827047d704=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 55O508Xq027766 for ; Tue, 24 Jun 2025 03:42:17 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2061.outbound.protection.outlook.com [40.107.237.61]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dr14ttyb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 03:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eyzE3pbmmmyLBl9UhPGisxZkamR4bZOl5x4/klexUdEkv4KatM6vddcEqYrFryz7BlnrGIjhHByFXiz33haqXFPJ2N5k3BaBZRXVWAFLUFKf1NpzXqSCkoBUmVzg63Acxzi6iBUgI1v64I6FPyPMsPmS6QoNU3BJGVDQRVAKZNWqzU57KWxpnNYdWxavuewsDa74Pk7sogY+SnQkYQ0qCcR7QcrpHDVFMlPAHr0t+hGtUy/KLpNNe4WPqF7wLP42VnPZ3V4myQp+1VaB4HhiqeHfBRf/yAtjaeYM0gldgEisLvRfLLdhpEKw1yb098TntIqDDymnnM4Qo37wbQv80w== 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=qe3V5JZV6v6hYwmC0djD52IYXQ0BfHzTyB1Om5hWva5rPhddeACkkoYJDemP4WaMP69qIdEUPtAn/4+j8nmwZMjlcbJO6SH9SfzHkUahfKeXtUOWfiSxgHC18QZ2Wpnbpd2jv/845Ld4IUTKhJslrdgEixr+DR0KUNnkz8XhoQ/rjGV2lo8hu+P5cggs9BYJaVYUw3tl8M9IusrJdgxVZ5eDt5lgt9Oagl/SZ5Omm/TENFYF5xCVPy9UG7l0IUW5NdGiOzn1d1kTuz4oKekjJ7XEAEWnzAA4Hm81+0ZWT9wh9P+GlvAbTTSi66qFb2nQkTYbo4ZTZoypF5V9LtzpZQ== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:15 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:15 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/8] gnupg: drop -unknown suffix from version number Date: Tue, 24 Jun 2025 18:41:51 +0800 Message-Id: <20250624104155.559827-5-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: 45edd307-1149-4253-22f0-08ddb30bc8cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: ounzDX2ehozBB6KQjY30O0T1TPHjcncTkQ0XLqnOGHJ05txkLkE44STC4Q7Yy8D7jmP1iMcPAIxUzYMambrxPuD6N/YndPvlFp8U9bzee5Jju2ucNtzpdP27pyGGEYzov8DkNJfifF60NjYmwAD+WO4qu/31Uo14cZ0GNZ8ikCcUrk6Ok1m5kiBecuS02u/D/eupOjn1Z7GnSi0mT+OxaE8xgRsiG8YuvVPo40ECvpJFTgYDtBMit1WNNU+X2wH4mW8UAEN+u+y/QHK5WFLE8JvPNX3jYBsr3RQtK+ajTep69e7QB5dZ4tr9oTGdtj7aFijGiI9BexNtHLKK/hZ/ZZW47auXdM6/YUYYyEL2af+nNxcobs2az/OkH7pEjn8fn6NKjKAJl89/LhPhTqfqmDlWBUFTav5MiGjeSj0/H/rIDr2wQnzkSBFo9FCB9soQz9pIpGRlZDYqGmEH5JM0TV1LSpK0Qo127+L40X7HiKI5ZeY0rHoTZlKJ3A1hGKtnE+zu+TTeHLKF6NYyQjxhZkLcm52KJsOHvlLBYyQbUcm4P4jQarnwLW6Nm5EdLhwLNLvI+a8ZHPtWDvxcdFJmc1u+FEOxdkvtBoiJXiCG0b77wjZKBDv7qmZObnGz71cFIPfLAixfuWSzYzkR6Aw3A5TH6ZRkwr7+xDdSrvS+xAaSIXa3JG4nTBrk0jflixMBhXMUTnATmNfPPbysDnILlTUC/A1H77DYOXnA+o+E+1gIFZvZ0pSkKlfyk1rCwuG6/MqkxcZFvpKfzL2ZrUxYOjx3fHJpdM4DV/PPClLL8mLKvFOcA2LyShu7ZjoYDnTEB866mZSSh8VxJ054uOF+0bdWvGw8gi8oIkgzgTNscHI1w8ppv7qDYFeRczNBpPlfXnPAwVenJp5t16N/z9WxiOgKfP2I/w2DqUnn6iXfXhhmfZQNTktcdUHRfvn3amjhYf/h3E5BxQyCnZe1t614eXfL0GOxthMuvXONUPpW+UE9b9bQdeSHErsCockmAOZQNSgWgJCbSPlw3zo9s2zQ+8hLTKtCZrqQzalqY9hAnfEeVjJ6oF8nteHrG92y4Ytz+Fzv4QFyfkWAyn2mSR3PGz/BMDzQCWaff4/LtLyPHnOhlnl1wGaOOkjbmSeY98BfFwrbPuhD/I+sX9PsDGhR3sPsajMzVyZlo+hfK/X7FH7PXEEHQRzgNl5wva3b/UxH+kd24Mq2PGB+fI9EjhNbEvgoHoo/F3R7p2ESfAj5BMIFekMjnejQHDocBKwG/1gyRPTYC1hcpseJKgfzgKkjkOMzgBZQcoFE7Hmnn76arkEJRIKDp/T0ZSJRlNihksGwFZMmNsoomKyMKs6ZCFlS6fcrGmAX0SZ0Fp51jCeLvxB3mOVNa3Bm5Os5j3nEPiBKfioAIXtbQRdzUCypCsIOY+NrQqPXtBf4K+zGHZc5Q6l60coUgT+ZTiYqbSHUaX9K5FD7E9SrsjUzP8+NcBM1EQ== 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IfxMrG5F0wx7adCKav2TC0yb3FLL3wl4fbzHHFTpJ9HtxDugMP9+axf98HM+x8w82VGmcO8mQhdAtgVrs/kzkUi0/QcdThpp8DZSvuUaMWZvLp+TlpghNTDp2pHlnzC21dNrkfej9jTn/OqEJM68IdNigm9OtxfZIqOJikFE6+L2dNOco3uIm4v/xjleErT8Qzcd+SEzim7gP6GbP43OGtMyXWJN7sQnIipqSstNdWAKHzMLaH/Db5TkMftqaMVnca4A9/ruESI5SOAQGf3vtotZTBcTkUlv5PYHwWs+cysdpAbS7eD/wIthXEpPW6dpCrjNiMivCPqWNg2VkvLOV3VjpDFRzmlCM8y4UQtWVd8u8rVbWK4oSIYZEdAJb1eAR3pjHzlQ8hnLG6fqDd47q2d4WqDzNS+xEaYD2cEMKwzmDDl6EtWM+El8JeuBa5uXFV3ni4hPg6Li+Zib710DXqA7oO9cWeyzPJLsf7VL8LBVk2tUIZlLX/ta3REJxyH79kY1i7JkIqJbrE8wnwcGjyKWGLNGZgTWdGzhO9b0kJEXavmGXPDtF2nyJeT22yz9vPGuVe4/C8yAaIcqsUxTeHVDncpmEJgxdqaaJXCenI9CUAO6/paMhmKmvPgY5JWQPGJQpdH2018D3Q2DoYwq90adMZ4GljRN2XA4MyZqFfxhEBl8T6Bw9tA3YjsHklyfrknMRI8lYKMXjaqzGnTLsaIs+P5ZGqcWTSnIc4CmWrKZHJnPrBQcRTo2x559LmHaID9Lvb0XadzfrjXOu6Zr+XOfJ/YenQpIuKzh9GKZ3zDEHTMI88xk5WcRJ4YXZ6we6KjYD/zTtoa7JoO+z/oicy4LjpxNuzAEBIS1ORNVRLYOWuacQDAkIjeMNZ8YYQHAPZZyOoymtv9WinrmP5spY6cINelD7lMSCGdP6CVNmZuxEBROXFx5toNAp7FJYp62gImxLyK/EKgeMwaWCgOJvHO+s8rTcM2CxnXia1nLBId7xjv5/PykPxSfHSKPN+S2LunMnLV9lP0gXh28RP7Xc69K9LRm/3+F8IpT9c3hqOOKfPiBnrHOGCFkbe0GW+64nbxYGqmZzdYnxe6GepEwqZ7M6toWKND1PAbeer/LUuLDBKrHoIPDhgCOtuG2blhSpBQ3+QWAR/hT5GbATcARlg7RwIbrrcUam+p5rBtP/Vy3M3Zqn+6PuKlsP0zFX1LJglbeSV0VNbv9n4gmu4QAgrpUBBb9tuKUXo80Z04GfURfMYJIN7t+ZaDrjtZR2L+Fol2bIS+H0vQgxUHdyQ3WLyXa6SJBkp9DIYjZ7souqyk4F1dGgQil852mJnopmiZdRQUikFTNi1RRL94XVgNQkB/jjTKOUaAj/cnoigmYusequlXUHdGeZB4uszieC8vUq+zzu5jv/HPMXqA7TfN9ILH4zeLD/t7jjkRZ8e1TCjpI2spGHaGWEIDRVFw/JZGXAT7z9uTjC7Pt2Z0K0MEjESRCuAp7MrfLcq0shEAFVRe6M+j+PN79O4nxvBmzn/HWF8ahCkx6WS9mtQrBzATFKgOfNhgQJykMLUkSn+PygyYYuZGkJJmDD5Yg1XEP/Qc0 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45edd307-1149-4253-22f0-08ddb30bc8cc X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:15.3010 (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: eOF5ClwmzMZiQe/C8nD2qNlmGao1MiqM+IFbi4jqcXm9bgcGAkS2vhO+RiBgCrRHXcSDV3DIz6ocpUYozB6jtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-ORIG-GUID: PIni2dzZNpJvJKAfQSun_jvZC_5WrIW0 X-Proofpoint-GUID: PIni2dzZNpJvJKAfQSun_jvZC_5WrIW0 X-Authority-Analysis: v=2.4 cv=XYKJzJ55 c=1 sm=1 tr=0 ts=685a8109 cx=c_pps a=JVdHkOrRnBzWLs0TqoS/Hw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=t7CeM3EgAAAA:8 a=ggHxpCNd9HcqE3gEoxkA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfXx0cXcRVuPW5L FRWYl63qrrKgRR2Pv69mtW0y2C9lB6hnIO7eTcetUAbLhXixlxjcpM7kJfnmWTgUkL+NXJ2aBGv feG4V37qW7s5VKGBHt11FDHg1bCiT5Gi6gAEvkyvwHghWBBeDkgwZr51CNz06SYzuqeM3412elu +iyuhSU9Zz4fynEK0/5paD000G1LhCmVEPbuDpuuGzbl+Bl03xwljEwmrop02CW4/0zdk04yPDP SRwbRPEbyPNBgqVC/tffX3G6fYC2+/dFXS7VuL/+twIbV9VAc2db6xVNeI3RYIyKpX/5iBBDcOs HqVumzgPXg8ERW6yrzI1X9HRBEcEbBnexpGYsFYrEq8ytzRKS1MULBkpKBSYB7R31dpn5SKYSTu grgL+1XpRpcWePAUb9hSNNLLOBpcm+dXE067zS2I+J2JoRcjMQKuQnJkBYDnFhDzIGvr4hRW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 mlxscore=0 impostorscore=0 phishscore=0 mlxlogscore=817 malwarescore=0 suspectscore=0 clxscore=1015 adultscore=0 bulkscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219245 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 Tue Jun 24 10:41:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65566 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 EAE91C77B7C for ; Tue, 24 Jun 2025 10:42:27 +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.5341.1750761738213828164 for ; Tue, 24 Jun 2025 03:42:18 -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=827047d704=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 55O508Xr027766 for ; Tue, 24 Jun 2025 03:42:18 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2061.outbound.protection.outlook.com [40.107.237.61]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dr14ttyb-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 03:42:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yX91/cxTjEHXcf6wZBMTLAcmmhyssSf0XIMOmp4HbKlsiRUfYWouiWb9Z87T4Re3qTaZ8Jz6pAqLxZ6mxAmcRBIANXX5FCuShgV40Y34IJUVUKNyyouQipUknQVZdgYEwURRwKmDzNVXJCNuntBOc3vqQEM55uQZb0Wjnhgql3qmh7tUDCwY+ZOd1+8i+mk1ZL6tiYLuIXCQThuSzEehCInxvy2rJL2AHTOo1hsASjmBRduTDBCvd/E6FLtLwhkMIL0NNe/6pUhjnrUEQewOMVOJOWLPyAn+cD7Li+CQYf9L6N3O/DbzchgdDfdabUX04HBsy/8iC9gukJ6mr8aoBw== 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=rgVtaSwPAz2p+iOx6UiQOAbfkyaOyCuKX1IUFcvp7CHBfcg/kp83DmBDm4mlPavKiUU4F5ZSRMexm+8tawpxxd5YMcdiv9ihTyf2qot27ipf1EXnBYefTKDCh1X4tlRCwGBP9SobTmIkzdS/hN7AxxN/2ljHkLpQ9C3wG4jkGGNVqa3vHyVN80TW7iAngA4NlB60CN09d28m8CkdbBe5IEj9YoYqQTlUUGV4tMnymv5fgjNSnnz5hG2m91SGVat3wakYMYN9oJNhIdwJdR8srzOgZCyq9ZVGekKfQkxaNIm6NVujrq6yfEg8yf2IPC5KyBpkYK74+Ko0EU4lcGoqMw== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:16 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:16 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/8] libassuan: drop -unknown suffix from version number Date: Tue, 24 Jun 2025 18:41:52 +0800 Message-Id: <20250624104155.559827-6-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: c1148fbf-2170-4d87-ffe6-08ddb30bc979 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: LsBwAxxokGszF43zfQpp8KM1N7p4EGAIdcFyz7ULk02BI9VI5/F+/qimYWFR0W81BYgx7rcZJcxKlwSfEaNExshfp4i6blwVokPchzJ876qJUmV+TIx0IGXoWaUH96HjcwgqRbweK45jErC9fF1jX4UqW1wZYCZRWvSyssL/lHIjsQcgD1NX9VT71JN7tDJPQCXHhxdr0uq5I071qSK2PxXiUs/p9fa0grDzgHQ+ToJEPZ2zKuADbphnoMxg+Nqv7BWsLbe1Zo2OtZxTMTQPrSIKKFFw++3PpMcHa7ysWb7HbtEDfI3mQDgLbGf0oKig3JR3xzD72bNsQXWcvl9RVrlGAG35zU+WdISM4KpvKpUjEy/xE+dbNaEDfLzyhVjyp6bjN/HQUwQTaQh7BljmKHUbm6G7IT8icMz2vi4LOWrlknHjyWfyxi9YNlIOQN2q+SeYa/Os6kNMMyYg7kdYV35pjJmUf1CT2HKK/MFrkAAF7Azr4gtFHlHl4YlFlaJD9kmVsLS8o3jELicqtBIGVNYWD/Xt2dVjUtmwnxO65qjdyXFuTYUR9Az51mmRXFmBwLK0JuHxk+7XYHZeJUISufitz1fgD++EsGMS1WJeOjbwP3Af6DxFK81L8Qh2W6ORmfpa88YpYMaahkC1aGLa85EnyuHlNfnnaZdyRW+H63U2znu5IUVZRvtJsqwxa+wFSTq9oBZjrHrDPM1fuv3SAu2SiNW9DS66ZtKqh6DFNIswN8yG3TTBDOkSN1GBRCeVB6zteSJGL1EhdoHxgW4XpYrNTgI5ad42dymaPzvxnxSHjNNkY/2SEt4IzL2i1HZnT5j8IUnWYiyzPKr8n5yPHtBENSmYgeYN5o0GYoADmXe6BE/Zg5fRBd/kXutL2FjBpGEEZ7yDvqbkYIka90V589yD3SaNU+SE/OGeXBcIPUxLk1rbZdQih4wLh+NMJkYffgGu6xwpzPJrTkIA6LBPppDqlA8e/OX1FyX1i8x8WR/w5oMUj4uahjopdWllqt1v5ot7H6cC/DB1+yEM5ZO9RJhnuQxU8XSqS1YvUe2BXm1GJ84W2X6Ko1EZk/0IJzSZS1PrhcnY2YLCPmbh5n+r6oNRVsgIEdMYPQz7hR6PS7752N9/eqwOfhREST/s6vC8g3ZK5elekAemHx/elzl/LTPyJhLFqJINKjYvJLijbxE0CmBZXm4klsKxygVCEAPa72PZAYK5RZwT1HWKiHYSXzwQjAAZQZDskMpFGCDYRAuLI5lnwCa1bU8pBvJzYqP5wWUM7MZV51glbUvEfLHXjzrq4sGdqqRthGrM9Zy8ZhARdZfAOV3yM63fI5EkFK4+932yyonmTf0LZ8WE8CWwiM0IQ0IrkSksIyK339vEWGNH/RqQuU5eAh9QpMl+MlAYkP6sAr0XuQD5ZdKhqYDQsvy+W/58PHZYfUl5L8vN6iE= 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TcXP6XJMRwy734pOzDl2FISS+vjKgLrY42fC8NtSmP1pkSs9XuAGgZQrNfDyRgdJeOMfPEE5IOL2psxBs44KbEQBIin1KOVnBQNOm1b1qqmlteHw6MhpQSAU/0h2STLfuf8Jf6CHcSjIZVkGjPQhE1OQHBQqN8oxNS2t0MadwNz+VW8EFjvWA+xFkL6BU5AZ7QF5Lh/sjnJHDu9h4L5NbThGTny4vr9BQBPDo2LFm0hNXsCwwY2sgFHcKfpMB7HrporNEkHqWVnn4zw8wAutDFAXvp4M6NPlpneODW0MLuLYCGGwOxhNOSIfRrBykauxIHhnWVlJ0Lkl2BH2Cqly2I8+8rnSNm5wKUq6DrJDiBS3IT7jhsgrf9hK5A2oM9ZlFGDlOpMWLWDeBTTBjcjT6vaoTITXLVORSvPHnYZaewsXLvJk5kVEl6yH2t+B3I4qaK+wrUZ+0puWfDpGR50PVzzVkZzaaEOu/YFsBry5x5NZxWJAf1JP8JY3e6ZcFVPI7xDUuM6z2sBiuGJSW4Xw2fwQAVnx1eWUEpKzFWO+Zi5cMIRoA9WTxrWO+Rl1K32YByzzz91+231PxboAeiM5uKhlvMP4pEvHXjFpb8r5EgaROltGZ8n40Gi1kG4iA5nYZb1GoFuKY/FNfHf8T9ZBOqU9SV56XTgGEj3JQX1KPEbIy29yQxZBBdH/z+1/qss7z48PSlTZvVQ2SkocsIG1xiIHxkAFr4VyRhGN2vf/H+Z4i384TSIrtFwlCzkccHnG0/t7o3Kutx3fNzllkWDiEn/BIXAwfl2WFYQ23HyUpzr73bWv1Ky+Rbgp3CzBbVqIzuuKSxjvZD50VZa3qQisFxrUHCb/cwTKztvqxizlb//ttQbLfgEzlGit7hIKdBP6XGxqovP0PAMOZ+yhevFjnu9Dd/8IsOA+m4+wrsWvUSgnhjkZvuloFAYG4n19VUHRZaGKAvTDrOeiyu/WoEZlmwccJfvow+gdVRBhP6XiU0dCazJFIWwLU2zPhSV/aU5p1mJkID7fBHTW8j6rbvOesVY1Yey7FgiYMIq0DWVpqub3ijp6pYUQCyPljAuDjQzHJExrRCI6BuFK7+SONTdsGRLtT4Pb0Y0wh7kJ8c1YOU1BpJy4y8URXQSsdkbjk5EnuljFN7MEOCidOzqISujgi78PifsaC4Sspm29xYwLzq8YJDrWoaieAWaS7fVkbK59uwSqq7tfGiN7OFuJTxIVEfRuOpDTP4244T4daGBs16So060rS9oiHHjT8ErhKAKIaqVm9hpKskO1Y2gpzjwvpP2g5gedQikJ/AJuN7CDkUmi2p10sZ2JUIXGx96pMMlzL/Z8x/ibkx8talxGO02sIoixn9hQ5y/l7N0S++vs7wcFcZkdyQSEg9zZBQHBS6zFwqJaXR7sjsG4Ee/QZUoi4aMpkgIWiipq6NCTU8oQQn79KkHZqVj9wseH8cB59FKHOdyFBbT8LiVQfvvG26K3lWdgrPRR4BVypzTN620BTg5oiJp4mg0oL09YVCX0thnzDWF0mP2lqmNV8nsiNhuCs0s8uChIVnq4qjPTx/jf69hlLId9PuQi0q1IfZr7GkvF X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1148fbf-2170-4d87-ffe6-08ddb30bc979 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:16.4546 (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: ot/dhLLcbCO+gp5g8//kLyc+EoXhc1HXKc4x3r+zeroo7DCsfRpKidmVrgAnkL7t/w8PrvDrzN2TPfzybPqHyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-ORIG-GUID: TMcq4sdLEqpsHjxEB2Y54FIeh_gEezOc X-Proofpoint-GUID: TMcq4sdLEqpsHjxEB2Y54FIeh_gEezOc X-Authority-Analysis: v=2.4 cv=XYKJzJ55 c=1 sm=1 tr=0 ts=685a8109 cx=c_pps a=JVdHkOrRnBzWLs0TqoS/Hw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=99BbB_j3FNS7aohJxzYA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfXyYaydgGS4yJ/ 4W7icnt4EeHjrvTKOKSRiIdBg2KkUzaU04IU737znx4KcqOYcqAMhJNxhMnSFEo5Bt+SRxiLwqm 7gUojgwxHXreGNfZ9Cpis2YFoOl0ncz0YKf85sF6nRKZpfxb06S7MMOGBGCyqV+K8AaA16TBNeP LmZnd0M7o7B/EZNmBFWMxx1HX1XgBJ+w5DC7g3fKv0qZ0L91XkrtLudLkFn88q8UYDVZdEheElD GW7SiZYXhCGw95y1N1rZP5YykAQwmP4xVQGV/DwTSnpWkPlXuJ2T+RYywd07UqvD+VE94YkIK7g U/nesQodgk9Z+dCYqE3aPJnJ0236zHBsvOBWkmqQbswQJrdpy6dVsMMKAlP9s014+XDOTikjrfi /kaCRSM3yU69Gi/CPUr4dkzovkvmn7MB1jeZQA0Guqcs47X3YdpH0SStQBdf8ojdUqHWTFLS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 mlxscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 clxscore=1015 adultscore=0 bulkscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219246 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 Tue Jun 24 10:41:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65564 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 E56CCC77B7F for ; Tue, 24 Jun 2025 10:42:27 +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.5516.1750761739906292456 for ; Tue, 24 Jun 2025 03:42:19 -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=827047d704=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 55O4cDGv027019 for ; Tue, 24 Jun 2025 03:42:19 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2072.outbound.protection.outlook.com [40.107.237.72]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dr14ttyd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 03:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NsfsGZR/JWOOwa08yRg4fk1HrM5IHC4iN0aiLf1FQ4tXt2VuNj3Hb0f24gMUFSEU51tyzF4FgtRBv94D0szNXE28HXECeLzdGGqD8xPhjzNnMPKSab1l/8eTlyIrW5THinFd9qP4isTk/O3fGxGqs83DypvchNasvKEPQRn6DpbKkWBaF5X2MhgTr/X/ptMF8zS+/9I9iUdda/8RdyrHCBUt7JXnttOtKSMRmwQqYssNBXljCuMzZcDqZTd3BCRfsrAY1GfyI/zF0700oO+pmgaGY9Aay2zCkvGfEhOx5LaHVDOEoFrgrU05Co+F0VDao+upP47dlel4v+dqoJy3RQ== 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=hOgxgWOuj6kBCiZwd9K/y2SZooVvVf0AJD+KBH+dQ/ZBnDs+snkdA8mDd/tGPwi+nAgXqnbE1J/FCKZ2DOm6IUse0rRwW9ZK3L5A+KyyVg1lylnF34FW9qegsztUWcLReGOp0K3DUdw5bqsq2LNa1nf6fJa27452Nf0fupIidFE8mhuWegVPfuMKAt19Rtz1N1JS2y1xff/8GhO533aoEwCEMeNmzJLdla3Kg+01gEdGbDE404yddQVOmOY4BGGzi++UVsvBFlLDkFxo889uzDEUoYFAPcovYFO6I/LnUpagJaljBgFHukp4qXthQCz2R8gGYuuBUcpFhaCjWwZqeg== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:17 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:17 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/8] libksba: drop -unknown suffix from version number Date: Tue, 24 Jun 2025 18:41:53 +0800 Message-Id: <20250624104155.559827-7-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: 2dbc1090-141a-47ea-658f-08ddb30bca2e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: ++S7YDiQGyglEVjZ79gMyqpk8F40TMxIc73Yk2+fe/3A9UsUnPDoCP/vEQIj9fMuC8MoLutjAd86I0Iy+Llg963Pb7yUxQbh/tQCwZUjd3NSiUmDyPSgovA3v/XLl6Ln9F3u5riOyMIMZT4L1/+fOSZNNTcwxCQXXj2CRz005+CGp8e5liRZ3+0iWXqahWGqcnkZxTO2Kkv3HlbZp5VOuj86xCR/V9BJdAAs39IYU39hnm0gZU+ogaoQA8x28PsPo/VoGC8ezh94sk5AJOXdPCM4wKkfprFaSJ1PjzEqR80yEj+BaZ9zMCd3IuIA252CHdTDg5+fZTHNveXxoGrFsr4bruCJzYZEq51G4oYlVpGwG4W2YWCiYa1FYCJoM+JR6uw/fUuXufjIPxjMIUuAzGmc5hLeBFjsfx/6iiWZtI5GgMUQNBed0m0/106VXXHGuOhxTGxOyGwM/Xk2gaQyhis6IYIZmb3i9wpJn/UlDvfh5AYRqJCyKQrIB5EfFjNztAnWENMRIZL6Cd4ppt8u0LA+U+nX17zd9DyufgYBIhEnHXtJ5Y8P0fPkDeOnUKDgv/xPANkX7Nxy8bLOCJm8c+W2YTnvBc82XTf0IFG8CBr5OcrOIU2h8Dj71B8RVeJgYYVP8Vsk5NNPhc2plfe0iHop9tAUPaF7rcToNvEqGCOt45dXWpNxJpKGe1r1H53H3d9Z0zTBYVd5Pvs3yb0+YyoKdrbAOryHxrU3ZTOlwfDv8aXF7cbHDzNB0se6qZ5IFOjHq0TTmJTQgvpIvn372er0fjalSj/jPoAWKAenGuZcoc3UzYteckbgSlFRruQRjwIcwan+5HsDRqXDOOcyt7b0zPyXTnHDAF9XH8flpKR+zkGtiK9hsVB0bTbtJ4ejSpTpK9HYPgewOhQIJSbvI6yW/vH+OBFUq53CP9PRW35vgA+zreEQOlABV+br72ITv856/b4q78YOb2n7GO2Jr173BFmvjJ5YPQVU8D+nFLB+U5OYus93xbHbuk3+tVG338Z2vPJwhkICk9Nii/nFrqg6hCGI8iCEcRt8Fbx0UzXr/deZgOnBX0DQyVcXhWNN72Z4fccKowr6ouS9KMh3pS76F5bgfZHPB/8KmozC7Dj5MOYTVac9/dFT8jdwV/GSzaHanNJeXfO8jAOMsZZf3b2WgjcGRaXYmp0eWQbKlUsdXCAcQGg5KwuA/hjpADfl3zW5b55kkMuAhCeWqjRd+INr5SMCF0S+zHpPsrEqtv8oe02No7VD+IIPTRbUkw7x4YC002NK9LScR9OCXvoWhgM7WYgicE64rHKkv3/ZlCq+D5Rv6qVal8vwe8fYf/3yFlx237GCZ4+w5Ul4Kt6LfWvBd+hSmEV8A3WGLRQ0Vts6qO3nqyvx/cRkImwj8xol+JXf5wxPl5Zxe5JZTUbEKS2UfOCsThRR94gvyJ8ExbM= 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hUkd0+200QnrNbq3JZrA0hGpFk51zAzUVJwdZ3ihylyzXseTVeJnNdM5PpBd9j1A4nWMUssYZOPR759083pL4sF8C8uaZxgZ6xszf/DO5PcAF2S/CIPZU5xndkx919qCmxC1unjismDsBvbvfJPUuIDMjYXs7pAJ/1BO8/ZYNou8xg+oi+K0eRkGRBphILdcNYx2OAXgoaPV8akVeVp45VLFnesyMK9Y3lhbzwV2cP/Y61UI7mN3zq8pwJNCWxoZ/G9gGBY7cYSe4yjdomYu8IWKttUmoR+oko3qIECRqI26C7aUwpFmXMPBcL5bJXY7Pa0iisqRezsotO/WEHlNsqrkSicHXXTEqlAuy69XpgT1bvM4GLoM/uOuSDJlq2rdum04P5cdhrJfPDcApv9pAdnm/WpekUHJ0B23SJ1LVO6GLOphysUOKbKfA3IuCGaygAQcypu8BzgcNTD8HMVWfw9Iti0Y7OPbFXgW3GmMIjx8hIKkUACqh5PJKrvBvuQ6hnjUMMA2CplwUd/WIEKRdkTtOOCdZn9HctpohlnwfPvq2nOGotaGSlaA4S5Zo5Z3Ib0ueTZze2LG4/oy7YEhkzO4c3nOL8Qad5kisXF1Dzcf0iOlwaoAvOXtvWxiILyebahi3DqOu76y4who7VkeMGKlxL46u+wa/9gcgPoDIbvEFSOW8AOg5f12+b01WjdVofaiMtwXrg6K/e2S5PKR99MadxoLVjxV5qh0rmTocDMug3ahAWgNk+vJCDwcmvekgOaOsFWSEor2rATNrdGUIKqzRET8mBbR+jlR0CV6imughqfAopU8JNkHgGz8K8+LBw4oYw9JLXRQTC32/5eadS1LE2mWPJXlyLOyg5SUT6HNxd/aJX6iXFcVB5C/is/GHbni8N74TGDUQD/IsgLAbVw8Sb/b1VDR42cbbOFHAYxCvfk95XS3Po44zc/aIdAz6oQAyKaz4vm0T7nJSNPCu6CPb11Utb0OLwiH+8zGGA6JlpmLDKMt5BPeSgqOmyAhpvEVYBhYP5RL4gX8rVOSfWhZTCKDPlw2NRloZy4rroptRxD8Faj2G18/u6BrlU2TOdMgMFlGjA4ee0VKVNPcG1S+H3yRx6BAAWeF04Lt/CeDlD2ShTamPNmk5dTakUpaZ7J+cwcdTPFrCjLrd2gNnnQGz0vFWjRaD07m8dGSsC+UhnSmoE9ESWvixRwmPYmDqOg3kyzm3aDaOB4T8qOgM8gEN2bYLIiJtBR3XYkN3FetZ5pLITKdRdQZgDDZyuCOTm7cHYD4ldLUlUBT38JYwTh4jYtnlGWIG8O+K4pboR5tFcQ83ztnEp+zKqDPKBO5TN5h76JaZ7Qa8Tpdrdf5zmsMZsFxKp55pB4z6zDa5S4BBRRuhCaUAFHh/gyeUE3umcGztX1aYAm/SUKppAU7bQg8f4iGspUdrbXeNtU8V7uUsxejqrPJrTKL1c8OyeRD0dPVjSNHAsMKjBBY+VF5C82NMBraisDGSGIK7SHeu6pC1LMC0E7HWukn4EDB+2xhG6Cgna24fXXatf1qelL5PTFD1RMJt2taQ/MMHBU2oZi20bcDqgjt9H+T3sEw7MmP X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dbc1090-141a-47ea-658f-08ddb30bca2e X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:17.6173 (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: Fjxdvl6aiEs2ZtNRcJP/7OWAI6pJzwN55OfUSEyHvw3VSoc/Fb3I2WGA70G4L9kPfVyKzG4hX9L1oyWcwJVroQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-ORIG-GUID: qrjcdBDuwVdPIkafmrsRIIqxE0u_EH9E X-Proofpoint-GUID: qrjcdBDuwVdPIkafmrsRIIqxE0u_EH9E X-Authority-Analysis: v=2.4 cv=XYKJzJ55 c=1 sm=1 tr=0 ts=685a810b cx=c_pps a=3w+TbvVJ0pkczneH0cxqQw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=GwUem0DFAAAA:8 a=t7CeM3EgAAAA:8 a=99BbB_j3FNS7aohJxzYA:9 a=4f0m0rT7cLEA:10 a=r0dl5i_q2XGqDZkti5dn:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfX8C+xbEiCqyE+ Z2b8vD7UmJZxxxLw7bHCNro5JQ5BGlEV2iDvFqF+0GuK+II0mzmlQE3FDl9++5DpO4UAgN6yx1D cZnaFNqeab0hCrgbao3BEMDjuqlxd8HkTYHf1AdosVP9YgQUkYMyBGFGSJKNWLybkA3EVvUIxt9 k7uZjKC7u2vr+X8kKU9xBlUO5ahE+IqEu2ryipBCCIgafpDdLGfMHLjd0T5ijIU81ItphybPiHb WF4+6wlnzwDpXvCfDwQZdFWtJDlF/L4yugb+2Iun6tkVB5xoBsK+lM1O4zuyMgrDn7zJ+TFTK99 qkvGdg0BkDMRgZ+vKzutG1jONL29M2m95e0DijkrporgBh73w/KXg2aboj/8bpggRsjp2NnetB3 weuG/biKxTqwuJP9Zfj9VaqMEAWZ4EcqZ0McLOlNHumxD8+GagZJF3TJKmA6wRpwF7HL14oy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 mlxscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 clxscore=1015 adultscore=0 bulkscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219247 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" From patchwork Tue Jun 24 10:41:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65563 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 EAED9C7EE32 for ; Tue, 24 Jun 2025 10:42:27 +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.5342.1750761740520163925 for ; Tue, 24 Jun 2025 03:42:20 -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=827047d704=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 55O4cDGw027019 for ; Tue, 24 Jun 2025 03:42:20 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2072.outbound.protection.outlook.com [40.107.237.72]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dr14ttyd-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 03:42:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CSSM7z+93vAPkspgo0wtkHN+/W1wC5tY8Hz1Zk26DwPuEPFoAK01bZnsgtc3drLI5kO+zKZXVmTFf+zGrOHeyP9yyWyR+LKtSI72V9Z8L836iVaaitYHRctD/IrzVdFJ1lNCpuIwRSl21V6pppGe4zwz1ssD8ikyl45ar8zPtJ4FfUxw93PdKRNRozJ+14ABIlbCoWRPMzAAVJjNgZehqyICygYTN9+pptA3v8xFV2PUkMRj/7bSBmHcNz7rJhZRZ5sBrw+tmRQCaH/H7H+NvY98ottPJMRpcwnQ5Oj9N4Kao8QDSFml2vrAdSvpjpxBkudpKrsLxZJUGq9aKhgWUw== 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=oNP5ACamjOvOXTnUqCsjETHuOLr/K3M0VflL4c8r3yo=; b=xnLcwgJf+9mbB8qTz+TM80NiNcruZbpOBE/oca+PNR77kafxeXu9kroqcXl+vyVBKpykGXoq6dCoT7DBF6pbvnIwsChV3h5T8ZfG1VWa2n9EVGTZ59AAmvltwB8eTlQTdUGCv+En1a/gPV+9QP4OnMJMUK2plDGJGSyRgXcOl/mtVLdh2XR7eP2kv6+mbJS0Y3UZDaz48mFvCsCKeHS869SLERAT9Zh7odzq2HdJwbVHQQdTjdFjlbK9bZQ+24z0gY4bYRruPtWJx054IRmQEjbxOVw7XMXnjbIdrf2mczRZfMI9SMfw9QD9gr3BnlTj68A0j3NdqBb+xAyM4EEu6g== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:18 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:18 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 7/8] procps: fix runtime version when using git shallow tarball Date: Tue, 24 Jun 2025 18:41:54 +0800 Message-Id: <20250624104155.559827-8-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ee0da0c-a0d7-4230-13e4-08ddb30bcadb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: t6kaKRSHa9H3M4F7B2NLlTaq5EuZp6LuVwFAdn4iF65531+YvFfuA91mve/Al/BFvbGdKLQ0P4S1UjgEOJULhzm9miVH9TMcI3FLFk+J+QwoBqmDXz5SjK0KSCnUzDeEhy1gmFWSUMZjSq36aP3Zl1yp5DfuKnOv/G9+b5qLAM5qIc8XXKGS6I0i5j4j4MRU7+UNpTu28AwtiOvSsMESvamgmVT9LNCG7lBqwp+071go8yqM+/Lx1jEpZAv+3HkWF0/cWcWzvbjfYBTRBJXVlRGOUMJefbl/aUxSr8vca6B0X5ob1UkloU7JKzAdIdH1pqC70b06Ipq/UWg53heMZFf4IVD1Qv6S3X+CEL/QW4ctwnv/puVrmktKEdb1GjEuXPR7gSgLM4s+GMYJJGXFGfNUSPFGvsSxlf60Y5YVexeYqtn5QLCo3p6BlnFhVwHI14oU1szJk5Dn/EfJIcOXRVV+1s96N+xYp6xqlbCj++Qpo6+aX6oNX7NSuGFvxpKwl0sBVbSpAy1sMMv0J1UI6C+gmNjaSrDKauSucAZVpkogkqUe9K575qdRk6S97mqrUUc3KUsozI7Bat9kyh8wQ9BEwpqUU5WXu9/jIa82fNDA0vfk+YLVgjnQ3wW0ji+65N4sOmfrQS4tZgezQAfzsGiOBu9pjKjD1fX6NSznwLLL9L8Z7J7r/xZzpmlY2JNkVKcO5LUIhGzQcPslv+Nb1UaRASDOdOz8K0UY9IoI8EvaoEdIS1K9NMdQS1YPB+z/vtT69fZRhS3MeHsfmZTrHVbVtwmcKg1THusw6hWfEJbLR9Q8RjZyvcPhLCclk+eqfvZsggOn80nX3YGiECN3BIm3M9Far/8RQ8sQEP2TwTTw+POC/VkzoIQksgq2hBLgUiY0gTo9h2VyWiB2zYyipq/95aqbjmkrBKn+qoiwLauQRbj1WEFpE+S1YvYMIZzUJgANUtyW1e1ryubbWetBjDP87qK9j8IugAegRqVR5qQo96j8HM1k8jvO/Gv1zViPFTLsrokXC6mYgRtORACp+hiNnLFVQsD3a9ybrsD1sdvrdMrfKLz++j6esLdrvWkVzqn3qJE32SrK6yJdOu6KNibh+/ZL2YrtKCV6Y+s504InCFfe99xXsugMJEqQJqWZteBHFz4FZIKXCjm0IGFY9A1gQFF+6a1nyKB3YzHn+fzyrfvTl9459JrWFUv0Mq3SGasIEarTm6/n9dsUQxF9r2W8Cppfb3fMZfYLhIpoPvXhHwqMcvvtn4sOFCLWkb6ksUinekDfQdrW5hrdJLZg7VbxJ0P//KJ2MMn/aEKyXzizbSqj7+0YF/nuOIGgsyhsy/ztpD0fbl5P/dPPv9ANODVft4PzTtCrMAmMlI54IqIhGiTFZcv2/p9IQmDv7VY5+8JriBxDnSCSqA3hiLZ1m3FIfFcAFO4+7kbR9K4cMPGI4NXSMtI4b8vwjYGxumjuWFVebwXki3raTrxERbU22A== 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mIAUwnAFFufs9n7lyAa5ez87/7+liexTteOKnH7H5t7z+j4Dh1oyoliUEDjRVYKiDKWYGI6rl93r5jvbG7E0KYiC+oa2gpJPQl5/TVCBhsF7oBsJZUx8lc0+G/OSxiOTDvJzTRMdbphpqD3+ns5/ONdrliUCiSlafJJNvgG14rZ6QLSDIaI5spqQyvjqly6P33OHpT9o4OTFhEL+LUxCQyBG/b1x6q9rEFbBdKUH5XhqNNqmBtOxNDqx0c7IC95dG5E5tAPvSXVdQ0mv6juHqpCfvXbKUaWtuMIOeGpeUW6IlMF9UHNGrq9bhLY9VW56AvObfVikf0A49F7YNzvDbOVYccC5nQMIXrCyiX5sXISmQ0MDyGZymnYKM2wnOTIyhPfLTMZ6I4h39HNUDMc5nDfsoGnBPHOlPerZp7IVje7fKskLpvfe7cJU9HsrJPrcIKAvGXyd3ldKGxLlU54u/7qbqYBWyxPJOkm6Uf6qnuMaXlv2Z7N1kaow4ySYu+8x9H+Kp1RD72na9vdSAdn6hNSAnHXfWjP9b40JYJrIW1Rvq1qtbOTp8ew4uOgbrVlHbWXvPd4Pvc5tXElvQOsgBl0MXNZepYjtFc24kJN3RHGuvDvBDCLP7FKWsX8txwsOUaUAnZvxwu3tV2/CNJByEQJx316gsEVcFs7Y22ZcCRQJ7NfFiPILck+xgrhMsn5GhbQ7C1XuL2pGhAoecZgk2OzPU8XIykjLxMW2FvIbD0kYGvZb6fni5zg/DVlOJaO6rQNwFXTsRdz+YKvB4j4q4lf02XYb2Mfj4cGGOooa0t02B9lQA2yuSv7+Sce2qz8GLtdXRKg/KYz9V2Tn+jqKqNVsARzN2V6nX2zPq4onNTQtWhP1F3rHo2mdXw4cGzH9vW8nImGyyZAQ+TfTZ/aHg8ibjsYOUCfbOOsMGAAiwH4ID1UtIWVFVoLe0MrD6s2vHjexx0YVy5vk2pPCgB4i0MaRpbfU4QFzTdwNXVeNnghsFNL9KWr9BLwb/Ys/WnUpQO0wC2iNi1+VN0FIjUoUJ/FAh0vbDQoMAJI32sp2E31Rvdxozhzczw0DD2Hk4NbA/iLNnfIpBFmSohcJK2Y9VnZmzn2OmjQqrQIrHJXi3DHZPWKhO5AJNnCZHNpwazVuRIHmFV8d63hQFpKM5wqxRTZvH0rgt1tgGRZoDCyj/KRLZ2VqmzwAm9dtp/WGCcHoZRZAFLRxO1k9zJ5CJds5BdzkLVtz5U69JqJ1t+p4SxNDA3KxEaLayd3MFRlILsDRmSXnJPxOHrzX9D/LvBUxy38Zmx84xq7xw8VyHPsCnYMIzqGKai+XiBzpTgYp90fVU6WpqyksGGv0/ufXaImqhL8DFhVsDlHFwCVVwiGmsP02Gi1HXhvgyY1P7I+D+ZFktt/UTH8i+Vd6hao0wvevnGlVyVQdBO7EDNILiBnuVK1HJnK/K5EaPoV7PkbQDeHP2icYY+M0JSynHLWldt6Rt/EtimWwgLkNF93YJlJR1qBKV9XHrVqdS+C3UsPN4bxVVqFmO0Eacl7VdCSEe+ghp9281mj5nac8zRYfSos+o1zFKdaiDz3G8qPkuAoXMwkr X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ee0da0c-a0d7-4230-13e4-08ddb30bcadb X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:18.7613 (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: lZjzjxhhgfyZohrn3hDkIZA31jjysEC2upWy79fF7EEiV1gkkhhwzMTYmwSiXnKcXSWtOKoratHZSlw5hUkfng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-ORIG-GUID: HxXoOOoa82v0BkMNQ5jQR5YuscC_WDT9 X-Proofpoint-GUID: HxXoOOoa82v0BkMNQ5jQR5YuscC_WDT9 X-Authority-Analysis: v=2.4 cv=XYKJzJ55 c=1 sm=1 tr=0 ts=685a810c cx=c_pps a=3w+TbvVJ0pkczneH0cxqQw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=t7CeM3EgAAAA:8 a=YBbYe9Zt53ihzEGwkDYA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfX+jbuK3Cxd5sO oD8ASSvTqQOOT7C9R0jyO4WvbfUXP+N32t8rBdsJ4MoqLilMVDbJwTsiZjUA7j39lV/Sj+U7H6U 4ijQWgzBHTjC19A04VeyE/TgczptlO8c+Cd6EzoXu6ZTi3qyUsyLhW5TqB9K54kaJT9FrgzkyHD ODtpz5znOWTwf3p/7pYZes1L7ecdbdGFYqZbfjxRjrEgOppFMiSGEIuE9m9LoEiaIzz9cGoiFV5 iAsdBzWZfdxCOBQlQCF3xiraGei/RqA15kgob0ipdcTpl/N2B7fKDxHOOs0rmiuu8a0jiS+if1K stxgKpNVs1qqraz/imAGwS2pcVRuHiFLA9VwafeZXcbhQMdIAi5d6Rdrrsdu9yhltiSHdkozNQ1 Agd66rEjIy9y5Rl2j+9kUVS/v7EaqzS5Xn1KD7fFetlJZ5SelpxFLxCwhxNBh3GpXPNbVbYj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 mlxscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 clxscore=1015 adultscore=0 bulkscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219248 The runtime version of procps is generated by 'git describe' command in local/git-version-gen. But when using git shallow tarball, git-version-gen can not get the correct version due to missing git tag/commit messages. This actually breaks reproducibility, since the generated binaries should be consistent regardless of the source code packaging format. Add a .tarball-version file in source directory. Then get-version-gen can determine the version through this file instead of 'git describe' command. Before the fix: root@intel-x86-64:~# ps -V ps from procps-ng UNKNOWN root@intel-x86-64:~# sysctl -V sysctl from procps-ng UNKNOWN After the fix: root@intel-x86-64:~# ps -V ps from procps-ng 4.0.5 root@intel-x86-64:~# sysctl -V sysctl from procps-ng 4.0.5 Signed-off-by: Yi Zhao --- meta/recipes-extended/procps/procps_4.0.5.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-extended/procps/procps_4.0.5.bb b/meta/recipes-extended/procps/procps_4.0.5.bb index 2b41be3930..db05eb3449 100644 --- a/meta/recipes-extended/procps/procps_4.0.5.bb +++ b/meta/recipes-extended/procps/procps_4.0.5.bb @@ -29,6 +29,10 @@ EXTRA_OECONF = "--enable-skill --disable-modern-top" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +do_configure:prepend () { + [ ! -e ${S}/.tarball-version ] && echo ${PV} > ${S}/.tarball-version +} + do_install:append () { install -d ${D}${base_bindir} [ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done From patchwork Tue Jun 24 10:41:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 65565 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 03A9EC7EE31 for ; Tue, 24 Jun 2025 10:42:28 +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.5517.1750761742705128462 for ; Tue, 24 Jun 2025 03:42: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=827047d704=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 55NNo3ZV010089 for ; Tue, 24 Jun 2025 10:42:21 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2076.outbound.protection.outlook.com [40.107.243.76]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 47dkqajxfa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Jun 2025 10:42:21 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RgruluY5Oie4BaaYcOSLKnxYnESaa6ccwIhtyjjaARC3T3FivjEnCXbWVOU9eQTIM+qNl/9iTPkTI/xcO7Yk2rPKDcyWR3xN05paTHl/PU5Rq2dVzxqk4+5U4TqqrLr1SjQNUT5EDw81yqjQIQXhS7NJkNOJYRrxTvPTMXRKwFX422RyV/zSRFvmJHlzFmaITSsuKcbPrOdLYeDFhNyJbLpxzACu+LsYIUhHg1iXQ0qY0+yZqv0190J9789Aun9xnaOc7kBwjQBHoA78JIVbSgawNKaa3lybDrOjnQZc6rlkSpgA2aLT5QA6ocYtxJXCeBvrV49uK21OjixQ3ZqP6w== 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=4CLEaXo7qkaQDJC0bQ+WGjo7VjJpIkFEHVfZW3YAxRE=; b=AmsZdYWNddfn7lhdKMZMf1LvzF1zLw7Ev0BUAbfOWoUSBcZKTZFAAKiBB7qNBZ0RbEzBHxYFOSXtRNcaUp78n2UeY3L7UDBKV4sJuq2C1TKdITtloDbsahNUOJqINv7UVQqqFtvQNj9UiyHbjTxhkDbFkdS+KEhJemKWE7gkWAjJt+VjzAQRI9OVQv2023T4U/Tai2CwD0YTWt3IrvF7mQdAypmdZsTRtxG2Q1kXwl9N8RCo8cOsBWx5/sSjo0/iyaQ+hidaOqxmEKb8qGWgCDlrYUtO4q6sWacIrIJipWDdWGi951ke+Q6+5t7WHaek+kULg6ks1qnhrWExCrI9VQ== 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 DS0PR11MB8083.namprd11.prod.outlook.com (2603:10b6:8:15e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Tue, 24 Jun 2025 10:42:20 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.8857.026; Tue, 24 Jun 2025 10:42:20 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 8/8] psmisc: fix runtime version when using git shallow tarball Date: Tue, 24 Jun 2025 18:41:55 +0800 Message-Id: <20250624104155.559827-9-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250624104155.559827-1-yi.zhao@windriver.com> References: <20250624104155.559827-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCPR01CA0116.jpnprd01.prod.outlook.com (2603:1096:405:4::32) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|DS0PR11MB8083:EE_ X-MS-Office365-Filtering-Correlation-Id: fc1b75b7-4cc2-40fc-25a6-08ddb30bcb8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: cF7dSp3Xl3WT3tcdk8Zc6/hfLKu5xh/S1TgyA3Kb1jlBtmhdRLajXqa5f8NnwCrgnY1+PL5LF+XSNDHA4EQheM/7kq0vGXlGuuOEFcxZhqfu2NAQnKnEXHRt3eGpfyOvmvBPrVhjYNBofxorT5jWqmnmPOkhd5Dzwje/zJ/oQiSYsBPyzTGPJ7vsyjHWv2TUMv/3M3LIuojmQiFkx/xqJ/hmTdsoen/QB3P4aAaVi2RJkgC9ljWDF7sKCjqqX0bumSyuHf3LDxlBinghpX0wfbCjz4t1cc48ipXsHkz7y3+Z522mNTOH+E0FDQaSkGM++BM2e9NzDc1oVeksNNmQkQsFyH70QwYDb5ZENwiH35dBUhdGjoivsmCphJZOGIcrZSE1nzxM1dBoeBLjEJfkRxxpnT8Bks2SMAms/t0+/syiH/1NMHaSV+PHsU9UB4KuB29MQoYCEoF2Qu8v7654MN/M40yNssGQpYw7lX8d7Pdrz4bAB3lI3NJI3GNxF9y3rltHWU/pJdH0YQGBpN/v3YZ7XfTG/e2PrtDwDWkNz6ZibAkoeiDanoOmSmEywb7NMpUjwl8HhNW9oo8Dbxrx1F/Ts331wSpDWSX3SHv+8LyC/x7tciSa7szLe0yHjPncQlua/LCsHUDS6nIC/GRx5u/TMk5H/LkwTNWxzdtlvQsbPJRvI0G09H8KgRd5AKzs2H1XNlgrOeiyjrh35l0WINBH5aE9oK2+CiArw15mViTv97nbOJyZm0Gl8dsTvYe2HWTeWfzgVKR3drhbIudAiDSYnhT/HTvZ1ZeB8TJUlmxL4JEPaKR2Dd/KIWJnO47imFns0Pe2QWoYnMUQcDB8OBT2t3HIiInubPveCM+GmW2CICVzjKiOQs0tiZOXUCOaZD7U23QYI5oHyHXzb3VCmgHIQGWyZwVsZi/7R9eIGA9sw6ZgvIUnbxZQs1cbGm942OF3qPxr7MBUQKGEqgoHaJMgNvPLoW8ZoyXsKEcRm2d7kl3jSJ81BgoTJkXDAFiKSP5D9Kprg/vtJhLCW9ptyO4XAzdLyI7uCo4W14T+jyLR4HHGLrM0nKJiPcC+NBRWBKD5cCoqJKOuO8ve5BRf5mqh8R0C9CQI71X1nPOUKgbb7kLcdfN9g3tiopCsqcqBFIW+ykbPZFwnw+pBih/qCLNESfgGH0qS1NkG4Xv/c4gePs5gFu2y9byhC7Nu3CVHFAwTtcfrFRRYhqamvqat3INAUiVecVOwrRpLStIz5//lQMK6S7Z8WA3NyU33knIWlN/1p6glSyPkKZwK1YA1rpoOfwgYdkeBU34KNaYOVl1dMUQTzklvP5yfua8Sso3MH8rMwmvFiNL3jGLfbvsVj1mG5aPsGecJ2o0RoKBXkig3Nkn4TIJetcwNlx1Ix+WLciX7IzdK9jk+jtzIW0IXTw6Q1y9OLJuAtN0J1YCIrxA7dG9DCbyIb30dxNrH0AVZ0uKqDIqNgLpBRBIRrDHXJQ== 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)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q4KEs3h6fA3ROVjdI+qfLbnzUTD9Wzv26DtdmZhtXS9OgpXBZq++s6b/27R0kbLP5r1e4AWofmjcPzzb0aaIIt4VRS2tag7eFk/j3bbqnT29jQtwZ3rB1nC5uVrZ779dOd6gof9S6mUAus8VWDn/XUseBUQP6ux1PWu/VOarGQ171OWfujJ0Juo1D3fRuzQ1Idc+vSAmquEoIQPB4TKg5JRbAdnkIU0CvfCNHGseorW36rTT/AxfOxRKHPo38Z8zjfeLXYTbjPLDJ5kt7NgzOfK58lmHQ37DXcwNV51NJBOzzHaQcVzDlj0cPE6TX6MegjBpiUcApj8SdPe9Ww3wDyV6gX20f3ZbfAWpiWESX/gAWgAJwdTd7wcfMH60h9bJj4QBl5vpHyrsl0V8s4iun6rPeiaj6hZv10IDo+u74MN0tdfWALvGyF6n23UZlJ1qfa6OKvH4ruF6R1753u9kXfp/6WXiSm7blo3b3SQERHi+epUeEvTKhyoUQbvDAIk94jyPEQ9nkSRGJeUxKvQOMZznFn3PzUaqWxXXdzi5/qnWVa+xyiXn9DbxOx6ye/h14mEATSACCEODDS4h2p6pZQzYU0fBpyp2rYqiZ5q0Z/xEI10DSVt/uSHfE4aG1nS28CIrq384G0GnB+8gVXsp64iak0DWUcu2l2/qkxsPyVPOxShpZ2Ml+4QYcQX8jgQ9sANNKAYx0CgNFCm5s1KZxAYq97cDZDgpMoMpQVcVld90FSQCH0vczRKYYfiQmh7i5oN1NbfFfXQEjj/sJ4s4gAZj3+PpmveZTJwD9pNqUhRnOkyl2WvLE0qtrLm7Vjb2qDM1Uk+cTkRMIcB6c0FvRZOCMc5dVT2HDlPMQiA9EIuG/0o9xvOagF2nywyuJSDoQPCI6rojmUeSdaRI9SM1ku1+FHRCI95QmFTEbCw84C/+pyz7npthZfK0ZUrpRfOQQIlqn/gdfnHnxB8A/Mnrgn6/EbPid2xiADDhlPtmwWo9HAPSDAXs12f6iHfd1cb8gYv8qcZmzCuIENiyrQ0BY128mkPfhlA9TvrVN8bLo6rKu7WZMyFJIk7IPMVDZw84GJvU1RGVt8YAxG1kr2ivZe2lsqbHLoiYh72lL33ALKuht/DE1GQRElNz9l0s8c4595J1lvA53GNqeHQT8Lt0I/pEDGVWQe0Y9FjGavht9/gblX0yrd7otDm1mLkKj3MjzFv6KNJpJW02ThYepsuHTfH1jacQes4d5qlEJGOLLjhgNwVEahyNL6eiiQMOsuxGJnP2DT2tiRFnffXWmODWqlsCjoHjShDRj7TMxxR5yPZY6jtl9esMq6LmFld290RhckRfFip8Cu3nuDy9FZRGd3b22awO4qjpjF7m5JhORRHjGbuKau2NO50zXRPru/U/BK59y3JOEUAI30SxXsyMqk6HH+TiERfuUpe2b0IVNERw4afyklPl3OCn6UApveLThBgtOzsk/vjni4s6DkQPwr5O8XLr6R2t5W6DCknp5IDd5E71wzXW+GFucPDJO/Zh5W5a/Z0n7zFLZMF2+kVSdRu0eCmXTMEoxvY0BkbjTw5CXzDEsjc7/hJ8geg2F0eS X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc1b75b7-4cc2-40fc-25a6-08ddb30bcb8b X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2025 10:42:19.9912 (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: 8Y4TOC1q05vDxfj3BKGE+2MqlipM4Vu4krUYrHRYfFI1FEhy/2Ga5lf7xhXK1whVY7TetvjkfGbEyOPGm8NXoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8083 X-Proofpoint-ORIG-GUID: 7byl04sfrzt7JLDbNV5glTn02pMWL7hv X-Proofpoint-GUID: 7byl04sfrzt7JLDbNV5glTn02pMWL7hv X-Authority-Analysis: v=2.4 cv=N/IpF39B c=1 sm=1 tr=0 ts=685a810d cx=c_pps a=rtGweklF6W5co68B0IbaYA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=t7CeM3EgAAAA:8 a=GNo9ETF_xeVcIxxexpIA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI0MDA5MCBTYWx0ZWRfX2R0xv1URfr0K 9RXqqG4Iu0xpAMXYpvQr5hIz4EYzUOyGBqxVz/imWghDSNusYhFsBAIbjLbyKWatHjcrle2a8A9 FFST41SgO0dsbezBLWseSNvSKkSsvg1TxeOO/2qaO9Yd8EpnJrVGLa/rUd9KP3X8uK50f+UmR+E AcWrlFaczZfqbpMUThY4qpmt69pO/Maule1HR8Iabbd4Xj2fsuTRzFCg/SUaMmIftz4gjjX/9N3 cpqC4q+5pS8JVQDWPFdD9wSa1UsOyQWC0GFqooB8UQJLmZZI1WOwsMKBWXa4d4l89/HjfvPJJtX iofX2I4WNTaMB/0tT4tGzHFAI/eEBb1y47km8foBTqv5RdUhZlv6UREuMn1M9Hc5cuasGzLCYKH otkWPN1Cd7XKrdQ92A1yfgq7x6D13EeHboIc08wzjobykLUKnJ5YieD1hbbeDpt3cKtDvKWV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-24_04,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0 priorityscore=1501 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2505280000 definitions=main-2506240090 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, 24 Jun 2025 10:42:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219249 The runtime version of psmisc is generated by 'git describe' command in misc/git-version-gen. But when using git shallow tarball, git-version-gen can not get the correct version due to missing git tag/commit messages. This actually breaks reproducibility, since the generated binaries should be consistent regardless of the source code packaging format. Add a .tarball-version file in source directory. Then get-version-gen can determine the version through this file instead of 'git describe' command. Before the fix: root@intel-x86-64:~# pslog -V pslog (PSmisc) UNKNOWN After the fix: root@intel-x86-64:~# pslog -V pslog (PSmisc) 23.7 Signed-off-by: Yi Zhao --- meta/recipes-extended/psmisc/psmisc_23.7.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/psmisc/psmisc_23.7.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb index fff1f218f4..a53c27017d 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.7.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb @@ -23,6 +23,7 @@ inherit autotools gettext # doesn't believe po/ is a gettext directory and won't generate po/Makefile. do_configure:prepend() { ( cd ${S} && po/update-potfiles ) + [ ! -e ${S}/.tarball-version ] && echo ${PV} > ${S}/.tarball-version } PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"