From patchwork Tue Aug 25 01:32:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96221 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 B4810C5DF9C for ; Tue, 25 Aug 2026 01:33:31 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12508.1787621611412918867 for ; Mon, 24 Aug 2026 18:33:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=JLL9MYIJ; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P0xJYK300661 for ; Mon, 24 Aug 2026 18:33:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=9fHc6cgZgRbhKyjY4NXr914NBxt6aPRaq7TIYGoB/pY=; b= JLL9MYIJtMXPoXPTGpGmQpAdpZnzlBbVJWV9usPcGYHaowj1FVeZ0GUYm2iQzJue q/rE/mhU1LGadJUmx4jlnJfq1Cy2tzzrccCqYY/DojQtf/ZRiNJpLtozsww2pvDc v2ZAPMi1lCcO70rZgLbdl/qu6QiWJJqLaywrPqB+8kQm9rA6N+oByIIs1ZdV2D+T q2uKdJLrnpcYuZaBN+PwUByUWi+beIzI0hkutrMRmpmMm/DF4WKpozkbqcsTMKw4 H1Vzc4CJVkDcKZ6RvaLSYzx9M2sX32a+begUj8sh2gWwmlQs9UkQMNJ0krUUcJmI 2923kwRcKR7Q2y7IhVzcMg== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11022106.outbound.protection.outlook.com [52.101.53.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gkfyx-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QbmczwdaErbjSB6eFuhr8D7hVMtKw4azGGigpbSc4aDYbsyZsCxGjvSNGgybScMnmXuzGABqvb0zJpucSPoRRW09ruyVkX/pCwRi2k8vfWKkkiAEg0s935lxzXR47WuNGXKrwzoAhGyvOmbhojkhWmbBgyfKyGCvbxmf1ZMB7GJr+6T0SsX2IimgEdSVhJz0MkAHCfjrMEJyvOCUXPFY7L+RlZYqUpSG8FmP8UO1qr5KMjmRyAr5zGpFiQ5/VPPFkDJW7lsgt1wFDSIpgPyq9olIlhQGtm7KhCTLKnxlo2NgW8KCpv2hQs5RiV6yOcmIP17OHqOQTQbdFT656Zu7Gw== 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=9fHc6cgZgRbhKyjY4NXr914NBxt6aPRaq7TIYGoB/pY=; b=Vkw5BFtMOk+fbDtyIrM3I9wjV3IjQ/6XhBcsB2sH086uyxGTyeADo3/qXij+FHPfuNFY4PxvxHkjndMCSos9+qkHDDlI447V4BTHcqWF9R049sBeHLi6u5JY7nTCoGBMi8r2zy33EzTg3asd/XuFyMbkx+XLFxAfi3ElVY/NUNn760DJHXXYK+Bo6ibta6xTTeyri1YwgSgVRzCupVnjQ+q3Oc1ddvU4lW6gZYEhAir1Uj+irIVX2m4AJnJEtvB9ijpFkap5enVptvEotPI+FqvPJtXCghksHBk5o5m+yd4sSbmUQhqFWcLuOrUBhzDkC4v0euZ3IGQDQP5/3CChRg== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:25 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:25 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 01/14] package_rpm.bbclass: Drop external dependency generator to support rpm 6 Date: Mon, 24 Aug 2026 18:32:59 -0700 Message-ID: <20260825013312.2695028-2-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: ab5af8a9-f541-4ce7-9410-08df0248db33 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|22082099003|18002099003|11063799006|56012099006|38350700014|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: vAYfDe2rY9AUf7CjVtiF1ordP6buPSgE8ndVPEia1Pgb40hr9uyBWkzHGpfyuXPrc87WKGm1N9ZJ1+mn/JJ2S1HbplDoD11koNlHL/2nIWVSo4RqvJxBqwRwZdv4Xeo4FPCDmaGAeBdL+LuTVT0VTtK0GJm48jX7iAjLlI4ysvgs97foXyCyrNIyy56a5m8y52ViwSiT6NCfld34kArRFrlGI2mp9r7uo56M8zi35I2fscuFlv/ksiDEy0zZz46KsvP/YJTa2mKSuKRonWQ3gtgjbdl7jrPcmCv2CftcdL9Y8Jt5Hi9hAM7sEp7eX7EUVR4czJWrlw8S2lhlBGNZI5G0v6umqflJ/JtD6/6Ij8cDmx0o/cghYRIKDbv9lUMf9odaxFAyD1XnpEEFr4jw+k2JVH471JL70KAeXl7aK8yNt5VdsqNYSk8ITDNcmy2hxvfoq1QjcDhAqnWy0TLeis6aepMySKNOgr5YkZAdl/Pn84LLSkBO+m9nGki7lxbLZ+VCDNyong/YrhGJZZ3P5+Ah6gpcj3x9IG0e2L32REXpX4yU/14+FsD4Zq5okarcqGHROFOCpASD1dqd2Y3z9V2cYFFC8OiOHK1E7FsyU37m1rhsmdkKNLrCCm8JnmLsdHKXW0wsslYo1F3NH5Y7Sg/OKSg97J2wMsgnaV46WkdpGNnKY0gxH6K4ei1D7KcsPHmK81A6NMTMDAL0r5pB5SdZBCzI8DCTpl7NGbzW7xQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(22082099003)(18002099003)(11063799006)(56012099006)(38350700014)(6133799003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WtSxIrGlfyhX5DGQJuMLQS6JMyaqV+2TByTHk2vA80BVsnGfZGfyRGb3RYGz/Y3rLnEncHvIFHOh3E/o3r+HZPA9CIRIFZjFepu6JM9oOWBfFHNlzjcIaYdNnPDrWnDQaSeI0iuJXrlFksS7Sa7t7NIoYRCNdq+L6MlDZEJ481DYT8Qz2aSLRhqCnD7rPMaI0v0t9Wmx9cIGsGuMo/uOqH0fmgetG45N6R6AwEwObruLit4X6nMpZRteGiYd8UKQMezaHEnEYEAd44vC+VRg6v/I+6rdDLNX6radDfwVuVoIIgtqht7uOhGGv9+sDCYMlO/zkJck5Ly7eADIKX4jonMQjadLR64c9xTPzwNB3Wx3Vxz2ZrJJlFBJimDw2AXaV9kl1XzQeIpmr1RqgcAMFGeH+OMP1EOcQut8ViigcJawc0MTguauyo95mcqf7r0JlEr+IKQalHkpKLGZN8fx0dgyhnnsk38Wkputx0EjPPsAIzN9ZyYsA4XjBHfwp8zOV3VEBY9BEJUt8hXivteX6NE9bcLpS8KHcwAZyjnFTx1dQSkVrhdZWH77Aa7PdQUP6LSOZIsM8mcvwa5FkdPgGnJyYs4UTCOO3owVmv2/antW1tS6ieJKQ5ZLschwilMROwfQJECTSEWajnUsMR9bWS9qz5V6jEzaNfTS4vMatmMx/06qI+9Aw7W6G4SetpDcfLPg1cHokHwzYeuK4yPlL+rpPZJuZUjrdO4rlvxbR3LH+FX7DTXL3eDVY+pWp1KkI9SMwa5jG3Va0jTuB3lnSlkop0L+EOXNCy6UKWEYnAlPLFX8lyLhxbS1Mny4WXQOa/HNA/MtOFco1mUocbCLijcxZsFEiVHm78N6dCh+KiZY/CzuuqyQj1EdA3X/RSI/AXhkFgtXzQBH4F1xlYMzuMBo9Sx1kVh+dAFq31J0X1tn30MjpEDSC5iqh0cPJuGByoiHEGKGH344rVDHU4mPwCcnBeTJRTHi18mbzjwDww22Sk0P2yJDjXEC5wKiieJvzuEdHAnlZsGRFCfh2f2r4afsMMSltw3fHBOnDr0QBtJ0oQptSyUnhDjJ34NcRphkFum/NEgZJUHWzGgR16mw2ZxofndruNTmScWm2xAWMydWYNcukyFQbuVmWsyYIi7cnItONzxf4iQ9PdkSGnwjGBZtEU92AeHZb1bGtGhH9/oHsY/DJVlW3fMqdvo82GuxnMTo5mUGSTfgpXiefn5cFv6Tmf2cG4AqUWzH/4He+02x8f5H4NQ385pDe9Ey25pVxAPFc1In0vRQHGzQnj33Yb6nqioyXQvui8MBwMZeAaBWfbZZNVrr024Gda3ZFR+qoTx3RN0c1yir54/DQ7x4BeyKGViCBciiZJVztgRtNUWPjcIbvU7s59y75yHJxMEbuHrWiAcgdNrv+fpvui1bMH+/NZBu2JZnqXdH2xql4iGFyKUKFKa+pi3y4ZElnTi5qZ3LyOugQtDdeXm9d59gNsP3ArrGSZ1Yo1tHjznkwzs8Cs0Lt3Nyzd9ziCxTg8oUjXsH6JF6JFVbcn7MPDnad27T+pl2jxJnkB2NmERv1/GGMl+CZ/TYkMnNAStlN1LhP289ASZLTmHFVBGpzf4ntH5YPeyTkLz7tSfWW31HEobI9EX8imgPBLFCAaewEUVwssspMzsz8HuYFpkO/WE45GOIa/Rg2KwPfQtY0ev92N+fxGK1g2pw7U4NEi7IFxXLqygPCl6rbDTomp1SlyJvXc7KxW1CZR0I2MiKAERQ30I= X-Exchange-RoutingPolicyChecked: JbsooSgqCyCmxORXumGYVLHyz456sEJruxdGMQfPWEvZp0DSWx1vrM0iBewpSA97qQ9pbw60tV3rdfFHt+3u5Zz6x7NaMfNebcOF+lSdTIdSGnKXROKB6iLhgONP4G4E1vZFV+5NoBeQOWMeoDMvNKeeGsDOgttHkxXEkxSU59ChlMbOy5eNwjnTdZPJGwCWmIbqQep7GCzMxwd1CQIdv0/LPHKkjdHR89v58bjG2GiD4eB0XIoh6l22/EeX9D6Ui4TU+p/El4FQtJHlVvdUGJLjCVDBjGLTcvt6/r6PdNsxP/LtUZION+YICXJaJBqYjN20hLXEh83EHCYcnMOgjA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab5af8a9-f541-4ce7-9410-08df0248db33 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:25.0821 (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: tiNg8M1OrANRwKqfEHUBVS7Ko3EzprD2NcJNIym5/aGHyPEvCNfgJt9HqKHHVoSjZ7xk5vMrWYwtp9PsHXOv7uwEj1GkJbjTJ3yEkfjA3GI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: rWGw8Pq14Xk3QJbYfdEyzPjoTNejk9Cv X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX1qkaXiJ9N1Om pG/O5M2Tav2eXDTiCXF58MJmYgArOQKyK2U2FbxAvX28nDNfgHQamY5GPVNiD90tHpRY3P1k0Sn IfJS6BBeBEIfP9+N9GusVpSO45JtSVik8DlL/mCClpsirAQRW4XhzuOfolcTXJS/HBQmaRj8fiM OoKwJHz9zvWl/hC4WdsnjVo77jfCeaPDWeCTR4/ANbSSk2rZzvWPxX2VAdQKM9lHU5/KTc6XbsJ plqhuq0d2UXHcFbVw3+kbwvTrwI/dZLRfqiFmsyZKfNa+WtWxFSzkKxlhVMM68nMzhyf4i1IGkB EdroAC8VaLqVgrkBU6p4y9d135Y51TL/SeqKD37tCjHAQtM3kaa46rSpgPVkcCGNVznNhj/laOt k17yGlXUKknofBrsaNgp2Z3SFQW/A6WrFUpMbDkdaKuHxRZnpZmYv6c5tAdFrOms8B6BE5JSJnM E7t/voG3UkIn6TiJPHg== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8cf0ea cx=c_pps a=lgz4Zsbfm4nnj/Www8P8jw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=t7CeM3EgAAAA:8 a=gH8vcDOTmKDoYkm8A40A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: vQR80dU9l3s4gjadoxBkGoveLyqxUomN X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX9jb4xowB4kw0 ajnoWaIyYFursjK+k6sWmYZLYRQIoNdDsFJt1D6XJBob2fGMoEuQzizD/lPe0xKF4nNMYnQemXg Py/qcEiEkCAjv46tDsU18tvQQMEgE7FsPLXEpfqe6rZ8REfpOaXe X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244172 The rpm 6 doesn't support external dependency generator. Oe-core used it for per file dependency which was saved into pn.requires and pn.provides,but that hasn't been used any more since 2012 (rev: be40f6d0bb80274366af00461112af65687a4de8), and there were no complains or updates in the past 13 years, so just drop it to support rpm 6. Signed-off-by: Robert Yang Signed-off-by: Sumanth Gavini --- meta/classes-global/package_rpm.bbclass | 84 +------------------------ 1 file changed, 3 insertions(+), 81 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 9eacd91cbc..f286d3a0e2 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -14,10 +14,6 @@ RPMBUILD_COMPMODE ?= "${@'w%dT%d.zstdio' % (int(d.getVar('ZSTD_COMPRESSION_LEVEL PKGWRITEDIRRPM = "${WORKDIR}/deploy-rpms" -# Maintaining the perfile dependencies has significant overhead when writing the -# packages. When set, this value merges them for efficiency. -MERGEPERFILEDEPS = "1" - # Filter dependencies based on a provided function. def filter_deps(var, f): import collections @@ -36,67 +32,6 @@ def filter_nativesdk_deps(srcname, var): var = filter_deps(var, lambda dep: not dep.startswith('/') and dep != 'perl' and not dep.startswith('perl(')) return var -# Construct per file dependencies file -def write_rpm_perfiledata(srcname, d): - import oe.package - workdir = d.getVar('WORKDIR') - packages = d.getVar('PACKAGES') - pkgd = d.getVar('PKGD') - - def dump_filerdeps(varname, outfile, d): - outfile.write("#!/usr/bin/env python3\n\n") - outfile.write("# Dependency table\n") - outfile.write('deps = {\n') - for pkg in packages.split(): - dependsflist_key = 'FILE' + varname + 'FLIST' + ":" + pkg - dependsflist = (d.getVar(dependsflist_key) or "") - for dfile in dependsflist.split(): - key = "FILE" + varname + ":" + dfile + ":" + pkg - deps = filter_nativesdk_deps(srcname, d.getVar(key) or "") - depends_dict = bb.utils.explode_dep_versions(deps) - file = oe.package.file_reverse_translate(dfile) - outfile.write('"' + pkgd + file + '" : "') - for dep in depends_dict: - ver = depends_dict[dep] - if dep and ver: - ver = ver.replace("(", "") - ver = ver.replace(")", "") - outfile.write(dep + " " + ver + " ") - else: - outfile.write(dep + " ") - outfile.write('",\n') - outfile.write('}\n\n') - outfile.write("import sys\n") - outfile.write("while 1:\n") - outfile.write("\tline = sys.stdin.readline().strip()\n") - outfile.write("\tif not line:\n") - outfile.write("\t\tsys.exit(0)\n") - outfile.write("\tif line in deps:\n") - outfile.write("\t\tprint(deps[line] + '\\n')\n") - - # OE-core dependencies a.k.a. RPM requires - outdepends = workdir + "/" + srcname + ".requires" - - dependsfile = open(outdepends, 'w') - - dump_filerdeps('RDEPENDS', dependsfile, d) - - dependsfile.close() - os.chmod(outdepends, 0o755) - - # OE-core / RPM Provides - outprovides = workdir + "/" + srcname + ".provides" - - providesfile = open(outprovides, 'w') - - dump_filerdeps('RPROVIDES', providesfile, d) - - providesfile.close() - os.chmod(outprovides, 0o755) - - return (outdepends, outprovides) - - python write_specfile () { import oe.packagedata import os,pwd,grp,stat @@ -311,7 +246,6 @@ python write_specfile () { spec_files_top = [] spec_files_bottom = [] - perfiledeps = (d.getVar("MERGEPERFILEDEPS") or "0") == "0" extra_pkgdata = (d.getVar("RPM_EXTRA_PKGDATA") or "0") == "1" for pkg in packages.split(): @@ -365,10 +299,9 @@ python write_specfile () { splitrpostrm = localdata.getVar('pkg_postrm') - if not perfiledeps: - # Add in summary of per file dependencies - splitrdepends = splitrdepends + " " + get_perfile('RDEPENDS', pkg, d) - splitrprovides = splitrprovides + " " + get_perfile('RPROVIDES', pkg, d) + # Add in summary of per file dependencies + splitrdepends = splitrdepends + " " + get_perfile('RDEPENDS', pkg, d) + splitrprovides = splitrprovides + " " + get_perfile('RPROVIDES', pkg, d) splitrdepends = filter_nativesdk_deps(srcname, splitrdepends) @@ -630,10 +563,6 @@ python do_package_rpm () { d.setVar('OUTSPECFILE', outspecfile) bb.build.exec_func('write_specfile', d) - perfiledeps = (d.getVar("MERGEPERFILEDEPS") or "0") == "0" - if perfiledeps: - outdepends, outprovides = write_rpm_perfiledata(srcname, d) - # Setup the rpmbuild arguments... rpmbuild = d.getVar('RPMBUILD') rpmbuild_compmode = d.getVar('RPMBUILD_COMPMODE') @@ -658,7 +587,6 @@ python do_package_rpm () { cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" cmd = cmd + " --define '_builddir " + d.getVar('B') + "'" cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" - cmd = cmd + " --define '_use_internal_dependency_generator 0'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" cmd = cmd + " --define '_build_id_links none'" cmd = cmd + " --define '_smp_ncpus_max 4'" @@ -668,12 +596,6 @@ python do_package_rpm () { cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'" cmd = cmd + " --define '__font_provides %{nil}'" - if perfiledeps: - cmd = cmd + " --define '__find_requires " + outdepends + "'" - cmd = cmd + " --define '__find_provides " + outprovides + "'" - else: - cmd = cmd + " --define '__find_requires %{nil}'" - cmd = cmd + " --define '__find_provides %{nil}'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'" From patchwork Tue Aug 25 01:33:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96228 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 64B2DC61DBD for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12586.1787621611837447426 for ; Mon, 24 Aug 2026 18:33:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=d6rHaUmx; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P09qJF214504 for ; Mon, 24 Aug 2026 18:33:31 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=PMSnjZ0Om9lyxUFPVbIQJjkiscHUQYRXHfWjUy1dvfU=; b= d6rHaUmxdJ17rdv92czhSGJvRv5Z1Z7C86SPQUxlK75PaByJA1fYCy4ECiHG6djy AYL+7D1g7rB8W/0pmxrmN1e7ZnCi507Grk+2aA7SuOKHuY5KEY60p5p4yWuSCFK0 LSUcF8UDWbPxU2CduAreOmP8sIu8KYqmmN1u8IN4at8H5xopMYS0pOezd2Y47A3b 8OUfJeFzQbtMV60aQVv5sQWh69dyZ/614wzkQ5iMyLjDmqbo07BAfnhK/klYj08Y NzIr133EQLsjoT/ktr/JCB/VwYUT5jvn+jJSM/Jv5FaK9S0aTCdreS5xcwHOvleC G7qhZW37lCCASHNtplmOZA== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11022106.outbound.protection.outlook.com [52.101.53.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gkfyx-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wkxrAydHubMqACo0DGuiXudN1RyPJTxbZQ1SXa2fx74DEt8LTt1H8Hj6/bB4XygP7SLIwZsY5PQefpZq1IbYLFYrkhTYzlgSQsJlV0oCp+xn5H9YhjrMifQyRVKCr/DVLOiiJEkL7f9usjWLx0O41xB3+PLI5KwfxPnd4LcBnwrazSSiYSF60Zaacvx6pY+db/BpaJLtNEL7TP7jNDAzMKECoS91KxmT1MEkpu5YSli4R9RSR2ms85AOgmSBv32MEC0kcuz11nwiLdYpRevL1Up4lB30hYlUI0Xy0mfGcqFQBUVH5QStQYWRGeZh6FW8g3+dXW3PaZ82X2YgUDgfzg== 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=PMSnjZ0Om9lyxUFPVbIQJjkiscHUQYRXHfWjUy1dvfU=; b=DcGbfefxTnVArXkk/Nfb7Ou/q0jBHL8bF75bsI8EZNUa33egwdbXFEaRJ+5f1hUXFlbTqaO/xawQs2ULsOVvo9U+tpojwAo0F68xTJtUugoPezHml2qJnoVhhoQBN4ErCSmDCCtrA1D25o0YhdWQrZbLF7uGH9WQl8LMVUa2o/4eL/MXC1rhxeYTifH5Yn9tq368DOrb1d3lyamiXzCnC1Eks/SzjLYLzjiL/EGMnym+Lyk6sdXxWUiY7h6b1ZGQS1VnqLsvST43aqr2xCIa94r6XkDLr/GqjXp+3W9v1IgJ8ohzGouUqP5ydXeWLqhMwfADWkpA5/c8x/ZlSE6DPA== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:26 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:26 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 02/14] package_rpm.bbclass: Define _lib and _libdir for rpmbuild Date: Mon, 24 Aug 2026 18:33:00 -0700 Message-ID: <20260825013312.2695028-3-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: 02ac333b-b43e-4344-f686-08df0248dbef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|22082099003|18002099003|11063799006|56012099006|38350700014|10067099003; X-Microsoft-Antispam-Message-Info: 7Aoxo82OutD905/EZESpBxbNeZ21lFZMX9o+ISWI/ucjQ8i5Lq+KTjB1b6ldD53XbU0f5yTzwMw8UMUjLhW8/Y/dssTfyV6Tla0JtocLL0scysr6zomLehs636uvhMfzfBTHatC1oVvl9ayHeQ3ZBl+xtvTFKxs8aGuBqFVazC7gOidCVytu/mzvCyvkkWWCu6fv3ToZpyR5NvqAgsyHkMwogYS1v3rnut0k7VmJ/RbA9Ea8sXev6XWm5S2ytedREGHFwOdCwjTW++17rgOilAnSOsDvonIRGPd4qVHCrCgdH+MEGm7FGNJBgMEHaPY1J0GKtkHrEJ9Fe02cnHeQEzWJ8Lymx4EnbC2sRTdxJhRSogUFlwqL3XWKYGCRqsyTTFAbCbwezurGRmWPEEdhDF50FLLeTAju00M/3D0dECgp8QI2rv7o/GED3dxXNz07N/gRZDTHjcRac/Jio5N8oQwAUGfqXxEjILHSzLZwnUKF8JkGqjhEl/6oUG0Redqb0iiKr1Ly3vudSZyLwV/HXjLeOFHQ9IuK7g/S4ea6jtKMxHyR5jnarH6zSZUY3VLd3be/NO0tXzfKmuaOxAGv5fxmMr+ky6BsxZlAz+zctxB8sP8mnk/jfwPl3cujnKYPdtErhlSOyNgDzhyAGng3Es9C2743vUBSyUFFN8Hu7Vpli5OCPG/iE85f5pBBwkv4FiNqAgPZEKhwbisKdf4uy9XM4qz5ie4rR5i4Tgy/jHQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(22082099003)(18002099003)(11063799006)(56012099006)(38350700014)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zr4meB4bXnYZZ0HDLEdIJrlF6qiRwHcXA2Ed1PmIEb8DbuSKQNKt/9anOs/9PUCeY8g53iiFhST3VE0UdPaf86Q9ypbdqlbFKMERRbLAAnZmTclCkXTGW/PJhMyGQrVPSLEkKrtULbAGtmPR5BS4Q0XKmjxOtMTFlzIFzYyjqI45LmCxSUtKJawNwVeR1s5UPuRkQwRCBR17DnKUPJawTW6RgLAi0nc2qIFrckjWz3MKAtk4bxEnTtwfDUIufgaY1IuFouc5Hn4lyuwgULmh83q7VfwzDlB69CcRmQUki8Jn7qXbAa3FSJR8FZRLdKUYDXsY4Y1IZaNLQdDf3wJg/AiRwsgz031HhbsxRSmFc7K7iCaaZ0CoOPgS9Jfjb5oggYjrPDoy1U+lw71Z1Dzdp0MySjCl1d6Y7lYuVVd/qVC6lyUropSPU60Ka/r48LIxVngX9k7ozh2Dd942tmvAfC6QCjk+n4f2lUxC9WYHCN6qhEAJvAJ0UhAcJ2eqGKo8i7pJkTZJ/uRlC9sm5mmHUppUfVbOpECr8pnBr2OFmmU/jzcXW32R4TLU8Cy+IxoixRHYZDyu5A6N69ILXzVpzeTAWNJ/x3EX2IZewWpiGWWsUjfuWeLEAyS6wpjzod/EeO2TDi0v0dOZO6IwI8uCxeiwTrS4Hk4xgi45Bv7Pa8MZoojJhnHO25GhQJMkdmz80hZg06/mjUIwDvV7nJ/+7CPo8EfYhLOzNthwf4MyRt9jpI0mgVDCdxAtAvLIpmgk63jDbJnBnMiuiJl1olF5xy8I1/sHWxitvVKYHJMl2bjQzSIqFnSwoUy35jBtivDliBl8rEqOunkZ+hiXCdTT9SzQgtH2E7pj/0keY5N5sFx1jDUDBto/ajpfR0msRwYL6xz0W5Z1tXjPq1pS3I9tm7eMS6X7LA8t4lq/lzrzgYJz7j7tOXc3ETO012oZJgkaJv6gZo3dpWGcuGscSK7TXTYfdQ6pfY6oyCPmpM0iIXwysuNyEZ4bvVNDMbJEOjXpk0Xk+5XNs6xAVUHhh9OKcnP970QHwYmkKIjBRnwgPEhlE+jq3czQTuFOdfIi4EREE76zpgqv0kGlErj+1cuZcnpF7rCF/C5S3iWrU0Gl68x8vl46JDn1SDEcBxbfbJvJTyH1S8igoRLxiBrDR7slV0oM6VuSQjyMNYk3fgYYj3rojWiomUvwv5vNvPuS953jSrchkswjdJndu2zxMtoayZForX9Nvt1t3EQ+xoG3alu7fq6SEi0hfAQqoTIQiQwFQkK7w6aje5LnxFfq+nFLUukxlEMtRLq5/v1mrUiS7/cKHFTXKNjg+Ifwl+3K0RZ4y89Gas/h+DRBhLMowRLUQ+6vt/67a7VzsFLpA5QOO5WX3o8L3QyE/VVys+jCaxpSIXKzai0gtnj0HCvnKZEQsOmBEFXpxQoh6nV4d8AAzP6lTL7s0pTl+mlRWdLqdhogQhkPfhi3uuyD5bt3nH3fisWLDXL5I0HlUH/hIWyBdOzzw39fsJM6zw4pjZZr7T+ObIgR4Z1DiXcsHTYkNt4UvKpQDplK6QwJKAAj1WQgN4c9ubN8ISTlEjmaqxcT7QNGJV01ZvA2uRegcKjAVfKOcpvKR/BXBqTCOjIjMpj40+Gj3vh2QDlEsb4+PRjPacPi11dSGnQSf15GzxBMSxD21CSAtDyrNnHJwVJVQcOyEb4o4ZRCfdtET/bLx71YTnHawF/9JjCLeHxKx/GNOGIAUiIZ0eLfLAClcS0t9zBUV1Q= X-Exchange-RoutingPolicyChecked: r5zkcPc7sDIQn7k6lQLMIR9pZkfRqHkWmF2vwo/BnBSfpKcfrcUA4Pgcoj8zDFslm2ypzqEgAnoRft26ySLtI2qebjdkVOFFkngDFxc6xRstZNRhbUYhanrVP3h7tFp5bWkJA1/G1kwedjJN277mu6BKSOCUC1fdxVdtYoYHdL3FqBsJ89LoV/730Bk2+EM2IXSqt9nNiMQokQIX1UISL1yhvoUDaF5KXa7ybBAQlie6UMsBTVulQ8wRpC0wN4U7e2xtJj/1XEtiAIj7fOHs3+aqR1dgb3DzxVCfBbIs/tPiL5F7CExzCWNJmg3TWXj25gCMewli0oeVOAR3Yjn7Dw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02ac333b-b43e-4344-f686-08df0248dbef X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:26.2235 (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: ijyFb1djHlIJ5B27K3XWi7ScARo5ap1fvlxaoCTJvVUJjHK96AEwfUCZuFGun39AGBbbae16d+E900FhoRS1G0axiRwD5oY6LfJZSU52SFY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: ycPxJ0sq4nljyTNb7yTyACVXEdIfMqsa X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX18dWoUUmPsH5 W/sEMbX+6oZaA5Cp93PzkYB39BvsMmM/64InpXB3bz0M1Jqm/Um/mkTbWetFBGp4ZIj2NGLfBzo JKR+MDjSinG6WUnnPlnr418+8ORVN3+rQ/5fZZyMRDsTF1bN91VKOpB8tJlDj8i4+tadJ3i3an/ EtYygV6mnmokGBBY+EozblU4pyhBMmO6L3VWrXmI2/kjCXbhqsw7h32hOq6OkQoJF2uw2FzdrlJ YWtwEHOIlrVsLSP+lU274KkfnR18WbWjh0f3PBhntVoFxricL6DHXJlBMijOzIAQpe0yO8AZLVr lbJwSZrprBrKKmVpkaVl8vgfl5pyzpCXMhIu2Wts+IKeJYp8v4triDMNyK8s0WuNcLUElby+RWH zC3HRaA3KaIi/ToSv7fi+3x8QgnWW9fJuh3Yl68EYYtA9/DbgBGWndbHseI+QhZYiLYH8jTUIQu eUobxKlSlMQ8lxq9diw== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8cf0eb cx=c_pps a=lgz4Zsbfm4nnj/Www8P8jw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=t7CeM3EgAAAA:8 a=uhQZ5Q_QBcnTBNJc4ooA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: AnoDNr1_wjkww6Js4I_Myc4Ag-zRfZTn X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX36RI+849BkLH ieh+cKjIrdwehY6DOFCAYEftO1Z7U4IpaEPCxF7sq415XoewlPVtwSIhXO+iuLN0lqxzpSl7ByQ 5g5rKgxZciumvzjsDbTmL3rCV/6Xn9Mi0TRzsxclGIgD0VhCQLgT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244174 The rpmbuild is from rpm-native, the lib and _libdir may be incorrect for target, for example: * rpm 4.20.1: No pkg-config files can be found for qemux86-64 or qemuarm64 * rpm 6.0.2: - qemux86-64: The _lib is lib64, this is incorrect when multilib is not enabled, and _libdir is RECIPE_SYSROOT_NATIVE/usr/lib,this makes the pkg-config files can't be matched. - qemuarm64/qemux86: The _lib is lib64, this is incorrect, but _libdir is correct (/usr/lib), so the pkg-config files can be found, this also looks wild. The rpmbuild is like cross build, define the values when run it can fix the problems for rpm 6.0.2. Signed-off-by: Robert Yang Signed-off-by: Sumanth Gavini --- meta/classes-global/package_rpm.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index f286d3a0e2..9af4cbdd94 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -585,6 +585,8 @@ python do_package_rpm () { cmd = rpmbuild cmd = cmd + " --noclean --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" + cmd = cmd + " --define '_lib ${BASELIB}'" + cmd = cmd + " --define '_libdir ${libdir}'" cmd = cmd + " --define '_builddir " + d.getVar('B') + "'" cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" From patchwork Tue Aug 25 01:33:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96224 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 E8374C61DB6 for ; Tue, 25 Aug 2026 01:33:41 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12510.1787621612575148747 for ; Mon, 24 Aug 2026 18:33:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=qwAiWnYR; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P1H4iw331080 for ; Mon, 24 Aug 2026 18:33:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=AmDvPiC+NnbVFpQxVSEZFhxxvRk7Q1QdqhZ7MAKMOtE=; b= qwAiWnYRpRkosACnE8ucIn8nWUQqEfO6v+aCvrlUsbqH854GwCWuAvCu8/uFTQE1 Ex1gFJfVCo07Cw9Oml3kzY95ZEmV/sJiZCbUsvbVlgQS4hJrJg3zGoMdSNTxg7ZQ ULf3sQsfjdzuE0qnN8zBQYscTKpFNWPC5e/VLuIc4xkRGoGm5EssHkL47/eW13qQ RSN38x/i/CYcL1jv2xUW7VOEpjewWJPIQxa224hCkYjrn77ykVBQ6oa9l1qUJ90S 47p23X+FmkraGR2676CnYu9TaxiaXdD6qzObfGDbTJyLRgz+1MS38RqwmMQEheT9 hDjl4tcE4wZlkM+l8s/jKw== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11022106.outbound.protection.outlook.com [52.101.53.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gkfyx-4 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I3oW/pKxSuVngT/aPH5Vv9YkX0hZz0dkPiqJocZxYhkTfxd+sHwVapysnSXYjz+MhUYoKKGqCSeURaTnGKLRwqI+OrvU8uRIqPkH2LdAYwNM8LR1zA52qeR/O89jfF7AWOuq79ApKJgYgrFqHn+LnGR3QQ0EArWrY/Z0DbbQi5pXf38FNLT/f3qVqOH8VmbIkn60+NB8ZqLNUwFHWDrbuFnzfaTe2ST/Su8SiHftitSWL9i7k2iBi/MOer1KSeHOY/XDRhVs/1jLprej8j/DyJ+vE5U0rRGpCQ7pBmCW3o9dcRndCu0gmgPVA+0t55XpVgZTXRgsqMdjdyKYb0Xm+Q== 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=AmDvPiC+NnbVFpQxVSEZFhxxvRk7Q1QdqhZ7MAKMOtE=; b=VJEXAzQxYiMTpN8ATCuzh45bVOQpqxasdKCBV9xnicuPuO7JPvX87PbvhmCv3aEUF5UOsLPjgwQtp0hiJuptIE0BhFHSG5CQW2pjxJXsJqAindcDy7OC3okxSlq6Dhx+dzVj3VnUbRuDqPXlizVBKgsIGNGDil90bgcs+4d8rLo/pd23zU0GSEASFrhqKF+CofzCg16p74fWqGHcaczl8b2kqI2+nMnsvJwfyPD9IlT0Wv7qsQFFisTBEp/L1dbP/lKOJJE8BOnAo0DjZLo0Q3sggzkD7trV4DeZ91nsFlv0V4ZZ8qywHM+gzApDRsHGj5eU+HoWW8Aoqe2ozJNDUQ== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:27 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:27 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 03/14] lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or musl Date: Mon, 24 Aug 2026 18:33:01 -0700 Message-ID: <20260825013312.2695028-4-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: 85270164-fb28-4eb9-2cb6-08df0248dc95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|22082099003|18002099003|11063799006|56012099006|38350700014|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: URs8sCLo1+rYxjMtXpK9iTfFY82YFMvOBnyCFwk8xnU6VFnwhhMtcE8X4h+TZJEX8qQQA2zSVLoW6RiwaEbxU9PSAbBLqO9o3+k7myKbI4ape5nRMDZO1DK8Pb3w7VVmNhmerkl11MBPniNfVPwTChtfTdY3kc+rDJZoLXpbJtuZH08qDzvhxE6FRPZUbNrcSXyIaY5jtj1Am+jHMsvAE/tp7DUjg4rXNAl4366QlIR7wRXE9N96cLGADQv2Qj1waQUSFHcktqnjQh+uuTFPesD9rSrzHF55c7nFhQadofiQCv03dDDt2b38EnhwC1ipABItTLTYrsMd6b+JFiYRnHoYaXx599jFJm8K01Bi912SX3M6iejIibtgy3EocFitVOTUUVWQDNo59cF8o/xR9QgKhukFJ1sBIfrbIaU1Menx9Jn8aIQnVl3vqIZewDiFRgOczGV39NgkZ33Le8PIjGGhQrBGA+KDA/I5JWR+Mue9NAvFYHMfjgb4kIm+4XXA+35aGF5LlMCwa1FqtGqPO1U5xcXilu9xggmHbTzFcxhZ+KvVbCC1zhYCPQFw8FhvY+3fJXprw955MXrO6SI+ZFe376okJJQZSxdCij/qMMPvRBvIbWyx1Ed1Xchmej7Eedx2KDjIpTfJouQQWFpKE7GuBWaTpw1zqsZmjUE95QuMRxPsgZWIHthzvld2Q/n6cnKYtX2oHjtHZJHcQHoOLPSY/kEOb8hygUqWImFPovU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(22082099003)(18002099003)(11063799006)(56012099006)(38350700014)(6133799003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WuMn7GZGp/LpxCj05fGVEZipDzws/sOgr9TvfcNTEiWTnILB9Opln5inlWiUpI1th5xoYkgTOM/tCFPbjjUvFZ86f0vqOYeoMwEJPT8YzA89jQjK/Nqwfqy1qLEMmo81fGCA/0Gci+yTbDCrqqv9vOi51gnebx70o61xxndJed1Yw06fVYofGc39oOKrjIcXW51KWelcdAxoCYlNDH6m8K+9EAbkmOsYqavZMeai9xcCNCvKBow0o2H3EDnFVhha2UtS8T+Hf+Ulw89vuaGhHYNiVnV9mphzqmMd4x4vAVVtM5AxCkPoSKFRTA7kwAuNkOzKMZY7LfC3T3mtcqx5bdElt7/OrXTz6lLtqItCKrpUu+w2qMsOVSheCatnk/cQnhkKDt5QSBa+6Fq2cUPvQSRxWBnQ9vgq8S0LbwgvY2HiP7ZBKfxYeEX6KxcTOihRZZqAqG8A2DyGIeDpPtE4mjK+KjqLq6D/s1P7NnfBGObAeL8Q2P7TE4CXwzOeMQC8QgI3Q7gbxvPypAI3R5fKwqyRezjP00C5uznHsXDJXrwem0glHfOVVEU+02TNwiakCJnVFBjYLjs0wWwmMdFgBHZ4MNEnSsGXRoMoTLznaADFZg4H2gTFaRXI9rHvSjj1zuIV9gwL5wUyuzCbiPFBlidNS7/IzHHdlqzu4P+czhe+Qu2ptWLmqNbbv7qktLglO3gRqVPSJTn/iNg5HEWj6XSPTozQ30fpBHEz+/zTXdJK3jhknAQ8dInGYuH90SzSM91CMnuZtS4acR0TMuQUXS5rYyMoOy9ZOFrYrVFy+d9wuPsu72Bh6CkBhNmF3YnuRve2QtglEqjsGK0WO9TRFwEszjul0REnNSBqssAmK42SLK4UqMtr0+Dnv7vgOGtbjwA3HOMN1nfZ6d4SMR/5Wm3kTEBzSRFGdVbdyhCTc1CaSVdgNK//Uec3whe3V1KVusgrxqj0csztACVseJdr+uu9wpE3sOANMSBTX0nbO0u6I2qE8ZMKJlsG/L+XOVLeNrdI6gTpVguNgxqPq9FhID/rjDao/kM0FwA1QAZ0h0GAJdj8VKSXbmZcwJNeZGXeEbDIKq12p5xZ3m4uCmbmR21YdW0qbELps2T5OFQdqy7zo1rckOCS1Le8lSdy4wsgUr9z0Ap3E9ppSUhW5yr/jW8+w4MI8WWcf1Q3bK5WV1CeJgnYSkIqoufyaXAdubHcCiDJij80B4A94deV9T7Hl9SgIXkIrq6q5LqvWtm6kzbkxZWl5gxSfUSND5mCZBBfxK1JE6uO2YgXpL1Rr4CWwCXJogHzBGCAmRH7WY39hT9eY7QzIQJEKTR1QIITZHnxpWKz6RSFLyPCat7fXrRTOO/uWCyW7gaZ4n6deL1dP+jY5azN7N4K6kqqWTersrwIjGSAl1vM7+ai8QaRD0MkX/iYSZ7DuA75gZssNknnW+dDhUw00HWQJJIxU0hHR8+Dg8KO2MkgoEIwanbjxkR9i7kbLNVN3W9vtDn8HrqHYTkeJKEqF4NGc6jcpA5Mg5esRHV5uPqIDJL4y0OFdYgR2SISZeXRbKi1Anpt3jqAu1OLHB7Txw/w3y9SyzOmVkXIaaqBJvsZlT6l3/onBpSWRSXKGd08K69EozkJre0gOygSggf7dFm5L3hDahTdug0lkXg1fLhtZ6TSN+4TFLhM/3ZzTdBGp1szcaM86hdLfgV2Qes1V4dIg0s6X04HuEVv1Em3ar5/L1ZSF+Ed2UaqgNKwZWdUopvy9JZGPvwg57E= X-Exchange-RoutingPolicyChecked: vu2vhlNibj2G96MUo/r4+RB0wx5waeajqSfQrEHEsp3UqtgZxsfpFR6JDA4sY53DbqpvMqdjuTKA9Czhx1ij8QZ1gxiRRoD8A09aOnYav6MArPsHblrBc6yke1OYxmWZI7H6B2wHMCKe6sMa1ipw8io1uKxmfXEQivglRvJQwVlvZ5alCOU47h9vdcXaNR0ZVm3siVRnAa6iJ/Dbg00Cu4fsycXJGst+THd6v06ftodecZEhzHZjV0HwuTu/wbvTCYYaZgI+z/kLkHX1CYlV6GmosQx+t5A93x1nasj0IJzGtIyuCHzFeEP3g3ONqsq1EkQTC6D2d5bLwmd3Xi0/Yg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85270164-fb28-4eb9-2cb6-08df0248dc95 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:27.3200 (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: 3i6nmhztVRgZ+pymcvUaGrXXMSCm9Nc92pa5G/8lCWnEaOHRihqpnPhzIY299zlIUKBpnRvgv1WyIGJHaTOWZvqZLJAWQZyVQmU4xfpBccw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: iZrbPD6xy9s5owMBuBLRSRCYga8Wa7zR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX7lsS0lmjMoZD v4GuO1xCjIKE68W4PztZ/Xl3vQmzcGlOuuPXCVQJBwGJyGuJfn3C9UQxR9V7Yep6ZH7rBUhva96 LLSkc9zQJDrHK7rpbqTWShkNmTB1eaEsnp5q9zavcovD02T1ZrdwQ1nGLzK9zvIX4mRz3Gu2XJm G+GrnA4tcppPAQuvp4phwnB7eFjM4W6iYnSly/Sq5CpN7ylOuYbnkK0WtWR/yur3Qmzg6cAOf3v Tt3Pdgs2tPEx2i7wHkfQ5PW4BI1L/SYkvzmK+xzLNleM0dmV40OFcBtW6kC5bXBUzHWHD496+yx 6IeyvanerJYFlNBIi3B0slbindJfOLk5wmygDLS9JbWsFiAYcYVhU6Rh7HsqcPeBq3iI/rz9s36 pyafYcJfxsbLXnsxfa+I2ZRCkboZwn0bw6QMxDS5z4CmTFrRgfbCb6c2pP1OpxvKYpGwMuxbhOK WDPYAuiejoqda5/ZbCA== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8cf0eb cx=c_pps a=lgz4Zsbfm4nnj/Www8P8jw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=t7CeM3EgAAAA:8 a=YcdC0ctDMGJcGoIPl8kA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 85d2Ik6UChql_UW7KTuqwZ8I4_yScCfB X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfXwZfY3EHFrUsC apnwglQMDmcB5LTqf70jMUhc9A8tpcYHBOWP5r/40o5ia+zqHIyWHLlyj+B1TNO8y9XlQJ6lfA/ cMjj0UCXSY4fxk2sinSCg7fhpDhgglxx5OVLjcS8H4tf9BF1b0KS X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244176 Fixed: $ bitbake core-image-full-cmdline:do_testimage %post(busybox-1.38.0-r0.x86_64_v3): execv(/bin/sh) pid 679 error: failed to exec scriptlet interpreter /bin/sh: No such file or directory It is because busybox and libc6 depends on each other, busybox' elf files depends on libc6, and libc6's postin depends on busybox' /bin/sh, the do_rootfs works well is because dnf-native has set RPM_NO_CHROOT_FOR_SCRIPTS=1, but it would be failed without it. In rpm 4.20.1, it let the installed files' Requires win, so it installed busybox firstly, but in rpm 6.0.1, it let the postin's Requires win since postin would run immediately after the files are installed, this does make sense, so it installed busybox (which provides /bin/sh required by libc6' postin) firstly, then we got the errors. I couldn't find which commit made this change because a lot of files and functions are refactored during 4.20.1 and 6.0.0 (not .1), I also tried bisect, but failed because a lot of do_patch or do_configure/do_compile failures for each build. For libc6's the postin is: #!/bin/sh if [ x"$D" = "x" ]; then if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi fi This doesn't make sense for libc6 since there is no /bin/sh or ldconfig when libc6 is not ready yet, so just not add ldconfig_postinst_fragment for glibc to fix the problem. And also remove the workarounds in oeqa/runtime/cases/dnf.py, they are not needed any more since the loop dependency is fixed. Similar to musl. Signed-off-by: Robert Yang Signed-off-by: Sumanth Gavini --- meta/lib/oe/package.py | 3 ++- meta/recipes-core/glibc/glibc-package.inc | 5 +++++ meta/recipes-core/musl/musl_git.bb | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 4a244ec980..2e348e0a10 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -1852,7 +1852,8 @@ def process_shlibs(pkgfiles, d): if s[0] not in shlib_provider: shlib_provider[s[0]] = {} shlib_provider[s[0]][s[1]] = (pkg, pkgver) - if needs_ldconfig: + if needs_ldconfig and \ + not bb.utils.to_boolean(d.getVar('SKIP_LDCONFIG_POSTINST_FRAGMENT:%s' % pkg)): bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) postinst = d.getVar('pkg_postinst:%s' % pkg) if not postinst: diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 3d721d8f69..bea841b047 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -298,6 +298,11 @@ pkg_postinst:nscd () { fi fi } + +# Avoid loop dependencies between /bin/sh and libc.so.6 +SKIP_LDCONFIG_POSTINST_FRAGMENT:${PN} = "1" +do_package[vardeps] += "SKIP_LDCONFIG_POSTINST_FRAGMENT:${PN}" + CONFFILES:nscd = "${sysconfdir}/nscd.conf" SYSTEMD_PACKAGES = "nscd" diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 3aec643c40..057113bf16 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -80,4 +80,8 @@ LEAD_SONAME = "libc.so" INSANE_SKIP:${PN}-dev = "staticdev" INSANE_SKIP:${PN} = "libdir" +# Avoid loop dependencies between /bin/sh and libc.so +SKIP_LDCONFIG_POSTINST_FRAGMENT:${PN} = "1" +do_package[vardeps] += "SKIP_LDCONFIG_POSTINST_FRAGMENT:${PN}" + UPSTREAM_CHECK_COMMITS = "1" From patchwork Tue Aug 25 01:33:02 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96232 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 73CD2C61DC5 for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12587.1787621612424887852 for ; Mon, 24 Aug 2026 18:33:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=Nc/seJBI; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P1HqnX332143 for ; Mon, 24 Aug 2026 18:33:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=2VmIH08WPmFh9RqJ7GxQqVf6zQjX4kwBgtVH+Gtn370=; b= Nc/seJBIjFG4RrA8tG8U2oqQi9VfAHtMD+hPAR4mBKHvOJaIeHN5Q7lEujzjUEjx VRPrS0A1R+4/HFdLE0BQO3ahVZqn2PWV06au8+jPhKrWvqFY7edEl0hi21d8b3gU dWV7rFBLobOPaXa8aVA5XLd4yRDgq+HC7Oj42kvHVazsCvsP2Zu9pjEv/Kx9XNwR M5NWoVba/S0M9Dmk7VdFH6ueJlnr6ZPvBLqWkQKOFZQ2U83xCqfdDYb/dLwiOn/d 7JwsaH6dNjhIraVz+r1u6w6jGimFICVrFxb0OBS8RWn/YosCC+1gOfuaDUTSMqca wJB74DIEjCNL8DexH2GaxA== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11022106.outbound.protection.outlook.com [52.101.53.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gkfyx-5 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vP5v+YHdRmASKzU5DLoaWCXVKKG7sjkoMFnAhvVjN2aMjpsEgyOqItf99OSdrkBa9pL6mM8iFzrm9nw5s4A1lSUxR8HdgSUy4F9SvCYAvggAmRv00KX3+7yq2QCBIEFLa3Yr4RD9FvLajMuRtqbRxvZDX+xpz+DItFE9nrKOXvn321O0TT3OlaG9JsGLqM0bENib1dVs5OEqaKnmcRfJMCjckc/yh8oGWSP+dHaD9BfFQoveJAuIbrPgnrsOCkpBVxdT2ozLwisVlcGA3WTW9tXuowFW7roh/aH5mwgDJReOLt5x2IQsJ6gjLLlM5J8sfeplGbnj8OkDZAKrz/2MNg== 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=2VmIH08WPmFh9RqJ7GxQqVf6zQjX4kwBgtVH+Gtn370=; b=ZuxXkO3o5PtyDxbownyPdoz6AA/iYQlf3hsHUmm88ANbqQ4nYjN+8xQVEC/SbxV3U0vm22+5Ori78q8z9e2Zm3ojJZr3ntnvKOTZxeQQIEVX+rGilknf2Os3Qxts/eAfoV0J1FbtFao91HQAo6D8yz6ZPwjXJT7InyRmePGALevC1W6q8ri8XMi6wPkipR1k69bsn2ODgWfg4cqSh83TUkjSsjr+hXJV/Ybw6kU4V4kIrG4fmmME9ERnjszMc9hEV7o4rFcGTm8i7pEOEwMM++yun3QiFkY6QXTGhzSFDxwEF0tjJbHShDLgY2oeIfBZMOyiiSMQLJIKD7w0kM8uCw== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:28 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:28 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 04/14] lib/oe/package.py: Don't redirect stderr Date: Mon, 24 Aug 2026 18:33:02 -0700 Message-ID: <20260825013312.2695028-5-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: 29b17aca-22aa-478e-9344-08df0248dd34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|22082099003|18002099003|11063799006|56012099006|3023799007|38350700014|10067099003; X-Microsoft-Antispam-Message-Info: XoSpd8+oITfIGh0HOIBX1SAoNk2BwUBa7NvW9vUO6ngPEjUKM/mbKL/dZnt5sgzv1QfUrfJJpYajtQnfw6Mg5hvIcf4AKjN3QkGehsurHJA6DHbv6HU1dGDZrGXGX3Tp7Pt7hhuUXvqrY9/H1b9LNgd2AD5LzSSqG+F0gid4MqVclychrT7cDfuuRSFnXzdQ9ugBzJ9WcJ9EWoQgRLzegprjqV08a/qQzIDXjAqKfJstS8XqBsY/pH6uQxX9QZn0WDerTC2Nv45adkxO2Yz+MuyDiZIA5oK64+9sAQFre+n7cReNEJpv13O8HdnliUzC3gPrLYR1NLfOa+Lfrmo8DoHShwXhIEE6tCKhgTgQiYCndP2yOAbCsaiM9RnxCBPPyQkDzzu13ZmtsoSxperZ3GBpbdKj2wmiGuvLul1RqhElvuKu83gmWiT1vje6T12m5oLzsm5MGfOFLMLnNNFe3dCkv+fdezxSQTtswnsBJoyHyk/cGRT168y6YfvtIVu8CxxUcGKuS3IpSqjhMJ/15ayMffR7rUjvqAHMY3e+ZeSc6n+ufom7UAfFUqd9v/k3aBmrxNmwm2ofaFRxu9c/qzO3Ru+ChO8ggelB8lD+ay2Qww6ufKY67dr6ljt2OSUMSvyPWOD8Nvwj2erH1LrXPl7VCeDdEoPTA/sDaG/Y8E4241oEf0prsm3hHTqrW1jauoP/lZDL9+BS4UbgACxQnGAItlDxGmBUaTJkJJoOCI8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(22082099003)(18002099003)(11063799006)(56012099006)(3023799007)(38350700014)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZIFyiIKHLmh7V0zksdZNkw7zYXbb6gOK/2y/FvxwNtzNLGxDuSCiWJR2pmI+y+iM1x8WvVgzI+WgGNOuL7s5ZDaRlO6CTqe01T0EqIxuCOzd1Qcv+Ks3gpNlTBA763KSeDtUULyOqCjlnZn4HvjEKJnPBCulSmIUQDY3FBtDbaHn54Risqs/UDrXl4kNPqAsvcSPjDy969CJKN51n0UykAWratXlOY/Xl6xoiipuRoM4BDaLjBwHY6pi2JBz0NiKAsMbSCAiT+13Eaxkbj5QfLS/DgoSwL/iGYMyivbQWTmAHRND6AAyRsBbveIa0ORIcRQwyuyffU1bx8YfZQjEANyZSp3V+9eR5iFEYAaw2gO5zdcfiznN6xKNeFp87QXn0+6Hn9jDqtH/SfZTR2vJY5m5RgzN1cpIVWiGaNvU7HxLQAgq/zdieSr3hy2s48Z+bSv2Kuhnnth6LgtwnQt4yDY9GU3ZIMPjV26q1xgo1d43ZL2ZJh17pVRFOr5IXc4yKE+7eAMrqpEfD9sBTn+NNQUZavFQ4oEkfmpEIjfhSSvpCkXIcTxcAtHsnMmeZu6GfQFs9WiRIfGzrzhEpRpsjS3a06SGprGrQ2eJAd2D3NdtVIghJWyF4zkEAiCJ4X2igpjMmlNisLMhjVG9w1P2aUrcBID78jQl7zYXqTQ+BKL/blnRZ4jKBt7hJ2rnrqtjqlslh5EwIXiyf5JSbwUyrplqnyqv/0n6SmmAo3xwFL6gBd+KkTrPBTyR/Bg+fp7pxPqShPxLpeFT2bltYB6WcaEsmkVUVDkdT1q8vXe+b1vXsAEep/OnJAfHURGJpO3VAe926bhT8lwaYSWdxBiXkTIW75ohhLrxYKOal8dgymVUTGokt2Vulp/Uw0ptpmJrD8Lm9Kv50pasMVV7hdJvIyIom5M7oGMYSXpnjIvFHJkoJWcR0+/VfxlTexuMMQz5gUiCQ15dDMER6VdQG3DdayNItaOJpK7OSvoy+8/CZQ9B9DX0eExHozQ7677LBGWYG5Cbz1dn1ZVA/NMvDKd7KxBWfMYe8dIGJ1qi5raAU05tqUMHAGFjFoojDp8ew91NObl8XB4/A2gCijko4EMz8OND9/ULguBv0tvTOZ9RTBd9txq4XuS2EZ+T/Vczfvp9Wxyvd/vAsP+qYp21V11UIIyOFQQx3oi1msa43M31QiIbStWHeFAXUjx9hki59Lw38zSuJbcQAILRlT/UmOnmx2TOEwjkGiOJ3nec4tPsY2wYnhqbAmvlaeT1C14U1XaegLAWg+bSl8zRMxlTdqOrbYnGlGborFWhV1uanbL/NTcZuCQ31hgO4d4O+AtJGElhgF3VSaq6CXWSMSgfBn7+lTfsMjq58eggklCIRIkzRGHCSBdInAHgocOgSpJOq+AFhem7AmRaFDiN/YHr4yquK/6UfZGBjeX/ywRBdwuXyY9w7/pf5FzzU1SeupisiDIsFDLX+i5vZqaza/q40BznCsL9SDQcC75QldsLsyTkUK+naF9ry3Fs2mpdtrt8JAuiqiI2zdpHWbx5BSNw7uR/D0nMic3iPRHdsBoKCnCcjO2wTOW+Egw2o6KAeS1Pr6dJqZUSVLaSmNOB0aLZwGwBeS3mxHHXCI4bxGUaRPpx44YNLahyAiHdmjLQa2XYKKyF4sEf68Dk4Cfkv0ZNfEFU4+8BQ0kEprmorzAiiGklHrGMfAkcYAt8M/bsdssk/DRuS1ef3YPMY6zO1vmzQlKCYVYDPqLGUgdyCDKk1RP1150= X-Exchange-RoutingPolicyChecked: zS9X+/tKNwSqI/8RXn4NllCVqMHJq2z8rbrYQCCd+RwGESj5+o2Z1N2m09SYAu9qNgMSn65LyLd61Kygrk2EANOHKb/GhC1u81Piff5MHGb2ElYri4cMfUnXd0qzFZQCOPJptMI4OCEyRG0Sih4DngcBwleAbSf62e5zk4uMbVJOAcL/kO0AIgpnsndS/gkWQU3V3T2sjcHmQQ+Qx6A1nHL2DTZl7/+fmW0ZGpZq9NTA4uKMZqEjtkyD1kosFfmWjRFqXwBHTqiOnufEYAcwqOue/ddwjHNk3M03ciCprv2nZ40PbJoyEl6GLfz9T28muzSnKcNT/8pLLv1VxbuHAg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29b17aca-22aa-478e-9344-08df0248dd34 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:28.5386 (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: DypcWNgY++SoAr3bZr2xpPHoXylkqcXuhdrBNzQGaiDTuZZagPCi+AVtosJanUXeMiOvg4e0ZCmluHk48teDhcwL0asFnbOef18iHyVFsRY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: yujGP79B7XYxVhP0CGpBkvuDVJalglQT X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfXy3Yr+0cJDBik qrupKRo7DEKo65AaAdEmELDaPH6aigPz+hrl7J4qIpy3clykJLDgnqtDhkAfH8NYT09sS4P45hy MR0Oe10sTm2f1Y0PBDDbmGgPhxfqun6yFt4ytzWAeMMo+iDWI/92LTFCzDsFfbsT5+XA6bDSjRM OntObSrZ1aOjXJAHZKiDCwHLS/3iWyK+fUnHGqXpkMbLB+99x8KPt+X9vu/5pVLUMZwHXKjRGkR n9N2Vqe/QU9tQoz0hZNv/N3vdJPyKlQEc3V8UxJGYqhSVfY/2IknlP7mh68d/HlmxWNUeWv3Njv nPcrIu2nrH2hH3TO4NvpLSoX2YH7nrfIJm+CBvFqzReDTHcVAmm8dWImW6mXQSNLdJVx72P496h /XNxbsc7NCA8Gv5nVZJWRHDBKP0+j9h/4Zjbam06kEUMGRor/ztaPZRp4wQpaZMBtPOlN2S9lz+ XHjvtC3Hmwwn+fWx36Q== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8cf0ec cx=c_pps a=lgz4Zsbfm4nnj/Www8P8jw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=t7CeM3EgAAAA:8 a=gZyeYKPtWqWysoXHKEgA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: PQK0jo-3iuBRWFjST-iv3mHt2k1-4Ber X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX2mo02wcRZtML tFT8WAfwrWoJ4voO+LmS1WODK6UU5KGeSmUuLOgnOL7UwZsOjzie6ug2IjS8MR7u7d8RpxgcEnF ZnQprNu5ItdzqlSy1kz49Vw9Egejo9oXNSwpZKBp101TV8/FtTxc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244175 This can make the debug easier. Signed-off-by: Robert Yang Signed-off-by: Sumanth Gavini --- meta/lib/oe/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 2e348e0a10..ddf5956393 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -277,7 +277,7 @@ def filedeprunner(pkg, pkgfiles, rpmdeps, pkgdest): return provides, requires - output = subprocess.check_output(shlex.split(rpmdeps) + pkgfiles, stderr=subprocess.STDOUT).decode("utf-8") + output = subprocess.check_output(shlex.split(rpmdeps) + pkgfiles).decode("utf-8") provides, requires = process_deps(output, pkg, pkgdest, provides, requires) return (pkg, provides, requires) From patchwork Tue Aug 25 01:33:03 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96230 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 66048C61DC2 for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12588.1787621612735586640 for ; Mon, 24 Aug 2026 18:33:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=NJwUusSb; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P09qJH214504 for ; Mon, 24 Aug 2026 18:33:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=/ud+6qTwHGthzRQFY/Zq22ZvMOftx95yhtndj1FM5ws=; b= NJwUusSb7ocWyxq1b6Gxkel9iT1TxgAqqJONHntNgxcYwipPy6P0sRcpnAaor1i/ XtVIgYUy/6bi6DHxko8qrN8va90EBZuKX/V7d7t57NFnMORwWFZcEJDvZYws5w3J DG3beTbbJcqACDTIGnA9uZG4C+gUkGFbVY847Jd0+HYuXHuoDLtQm5yoiZkFy7rq Fj9llZZV7aNvJCqiJ7t8T5XRaupNQCyKaU8YgpqZUFqdPJ3T0c0a5BIBBDIC+e59 Ig9fRHxzN6O4dnseo683IRvYGwS0DJY0Q1YcbsNVv+wdMfjIlLclhTSPjUWqyEoB Ms91TgxsdDWE4xU7vW9lAQ== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11022106.outbound.protection.outlook.com [52.101.53.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gkfyx-6 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xQw7cOpk7/kdxzHmSXpwMpaIuYEVAaOj3u/JQDtieNQT2X1XUEyn0YmuiZh6cr7yuzGceOYgmA9SAt85DePynLuh2AdeLzxhp8unprQ7xsAW1BiMxFYeB+OkTzanKjHaZa+8K7lbjCripwPGsVa6UckBlpJESmSSuUMR/USSDTYoNVIQgJ3upjbPtdjX9NFmQAv1o5r6y+h30GLYZhN0+TrIt2HjIH6LN6sqAn5NY7tV22ce4QSkpufWPVmj12Ex68KoGlHZ3JPzHpYHL0Zoa33uB72vx2tbf5U08WSEQGe06M7LB5pJE5ufT7Q1svZ0w6sUQ+RwkoTcTvpq3UVVdA== 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=/ud+6qTwHGthzRQFY/Zq22ZvMOftx95yhtndj1FM5ws=; b=nX6KIa+Hou1RuyrjN/UtNDQrvB8D31f1BWhh7h2RVBa4ibHAtlR61uNX4KJtfUiirfSr5wabkjJIChn5HJHGk4RiN+agegIsffm/w9+/1e9derOvS6laDmofgNHNPqn+NrFxvEvtFk3mnwIZA4nvqhnRkwZPvB1+sX4GKaTDiIpg7S7VLWitdEKL52K3siVQfgQXb63Fzdu6bPmt4mbvET7ClKhoe141awpfJjJ/hF7JZ962s1ajZvUPx6EhdUs5V2mgvP9Qcq51uBnRxbEoX+sY8KNz53FYaoQfJNO9W60gVFZf9JmA5/RaHEwzOeAiLB9MLzczWVdzJR5Xq7r6sQ== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:29 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:29 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 05/14] target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES Date: Mon, 24 Aug 2026 18:33:03 -0700 Message-ID: <20260825013312.2695028-6-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bffc3c4-ae0a-4961-ec5a-08df0248ddef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|22082099003|18002099003|11063799006|56012099006|38350700014|10067099003; X-Microsoft-Antispam-Message-Info: 4RmXhCJNkNlSR9qlHDoVTs1rk+50Lfso12SVdRIjY+iVmIsNYnHDCiF4Asl7CAw6XQmd1Y3Pc6i02/6brs68p5v/ALnqPeGCZrdsdd0Gmy12xh+Odxmk7dXYWCFyfCY9o5PK34hM2VB8It/Utr3gTOQmZ9Gh+jClvtlyufqnvOkN33iqv17ZM2/Nz7O4Ikl6Z5eJf7OT9LBMcYZg2eaBXT2j9omQ+yfYrvIFgosJ/y5MOGQsdpWkT9C0HSq7tEK/0dhaR7btj+ROUGlkO7cEEgAYbm1wmPBCHQM40MiL0vy0gGEzKyWUvfQpCKjTsqVmyX4adYJVlCdofXPXxqM3aaGZBWZxjr/7fTPmpdJNQgodAhmPfeD7Ki9XtsWN1O40zdF3KpXW1L9n12kEnenKwgEGQCzVKhTZDxvmVlgXr7We4BDc4QUNMJB4npd1HxIog2HC91Xh2X82F5ZVE95nXFZQtECIvH2CpaRMMOAuMZ7COEqXRUxhGjZ+erYGvuinKakZdOSu2Fs9hzFWn5E+kuct+1OiZqvrwgogQNnU+47Kn3g0owcPCooxZt/126a+C6JnxMrsKTkkTQJ2XQtwHISF/9ERp3Aieeqd8ZbjIPmegEqvl68wqz3dwYH06Al4lk6clU5wQS1/uhanxdQG8ooqIL5f4YTYyEFaJRod6Q9sS6FeaSJiQYfhM9OWr0OLvwOcYnFSzapHdmPi05DdCDBkEiY0gizIGfICi8HVOoY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(22082099003)(18002099003)(11063799006)(56012099006)(38350700014)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KxGVAFYBgevpgDtLMQDd5AGDz45siIzjt9Nts+SmlOgRvV5GxUuzha+ZF0yZg9G8iu2rM3t1vfpYq9mkTL4sU2NFN43pwprS5giCmHZBXH33XX1UC183TkF37zK5KhZ9wTSJg8nSsUXmyWfLEyJ2Ms00BpfrE3OFjCK6pTtg2XljGrLvfDeNOtnic0ianNBmVUqoDKHWVpizrXpIklPjiwAWEofLqygOlS/DnTJ/ay8R49mZr/WXNIjf6k97dkfPV52xI78YETM5egD2t6qMWdwUlG4WHnC5tTLxpaO5948eJTJntjzh2w1EF1LCVo4ocpzJCyaBz6RptfoFCY5of2tva28qVHnBWrvpGiZzHZ9S/iL6c2WsXbacNqojzUqandEIlwObi4YyW153c5+3bJFur+zdoLnMF7xKBecdMA38PEbm+HJEi60mWQagtAH9UdrRKe6IXzQzOMUD4aFUIXDpcI/+1J9T15zh2/YXU/Q3i55cNDQrAtHCtemsXlDmP5FdqIDtoK8vST7x/ZZwmYLa1TE2VU036Atvh+Ezv4DsJSC/S1LiFP0YNBQpBrByFZfAHffZUdeYWJZOSTrprzT/ewh7GzdZLm4yMI529FAW+48iECTOJSGCFEk9mKxmAYxNOMZho7CqwvyCRaxbB946AZLGi0LBOOSzLy3KPY8jRSGiX+/NzFIbqOh2srBSkmFaW5CWjEl5wR4FDmfRDuegAe18pgFdpW111FOTTSF9+bd2ISLft4ZWqXg+DXGYIbZs/hUpZiZNhf4Wnp8likGssDRt/fA2VT22KFjq9jm8SXKd4aFlR+gfzcP2ysgzUQNRan1so1sdrHAzruPBviXD7MJM6KQapjFSp+B6Z0FzkyfuWlOJ1Q980y/TwgR/mc0kZLC1EFwLIONaaxLrgtjwtHkbs27mhjibbR2zqCn2h6EE8oRuKQE3BhQzYyRhBcFMOb1mNgTkT1wrOqwUDQls4mkYw+7fsWDd72hV/vgG9lil942tu20TBebTmrDSp+ijZjfPwusaJ18WBV6C5n4z0xTU6iFzbamkI29lwD3jGTqi9J2OULl9XH8P9BLI3r2UyFpj5ID6Vwk7WVlqyDtY2c7Y3Iy5VimjZ4yqpwl7/lZPDb8zdyNBfyLQM+wW2PH6rBNEByfx7NXV1mIJ4pdmgQaspoC0/K41E9DGV0jJ+ZoTnl9woQcI+/kOrg9UyKV2KSStRfylX4J4YI867g+AH5sXXecVgvNP1PeEMHKv6KngVgrJaW+hplaoKym/TJsmGaiJCPTgNl/HKdQtnDpBuJbPJVHIVhiwjGg1U+/emDrJd4U4X6r8M+TeO8ecyvDANOLgIJPnT1/+ImVF2zbC/auJSUpI0WSYmg58BY0hJfIR7oPFR3UwSJnX7Rjl6mqv+he9iBv0wEhyJfpkaLy15p9Rz3SfJ/iNupVlTCyf851yOiyGh7jTs+MZMz8lFKzRi5qov0nNI4aXNNtDo4EROGbsfQ3181IzqIZNlwQqB5gBIgDv1yBFN0JReIbXv0S0QhIehQIbqVdlfS3kfw6d+fv/FAomAb9xELeMWkKnenYH5VpCkM2U8Y8LS4yhxHKWno6UalF06RrQ4lZbwlsrOpVZ85SxeDZJld5iHG5tziEYfliDnlw3rlydLQS+IvRFByrMOiSQPCGsGCQmJ1F2w9Hmly+hOsX3SB48dLeEdSQkGYvJFclcf/fxeF06+63K+PZvkTFvVt0d+KRuRgtd5Z0tx/MgHFanfhyuJqk= X-Exchange-RoutingPolicyChecked: v42w72OXe0YCXL8uo9BZR+G5BDBW1y0QZjLooyuJrKWeW7zoyR/1e9JYNBM5V50c5vtc56RLfQld274dTRRSTHOqXfrUHKWHl5H+wQ8uCb+5MLZNH7WNjFfxbkM5GYxJVYIUKWI9CuSrBc3bFWV2nx6eBVJ25R7PR5//E2rOQKzD6LZc0CuOYEEbJDzIwKCZqzZuhkJ6mw+czcAq4o+u4VxStQev4rH5nWojqSQ07/AVznrCoV3wddaYGSD4FYljc7F1ppBKwKZD+U7OCQOLZ+kJGavk1fODBUph5O9L1twKk/oLLylyyubqpGXw3wQSnE7coOOElqJO+EsW7xer7A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bffc3c4-ae0a-4961-ec5a-08df0248ddef X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:29.5314 (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: tNqiSzIOt+YPzgujwA+iCJWMYqO7IGvWuRf70Zwl4pau2PP0xviPVZprJT3oSUr/JlTIUfIlAyur/mM8fYb1Bm55x4hcyCRYUAfwm0kZj0Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: KOKxO_fQINwK7a8goIQwzhiI1SLqaJkg X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX2YxQOGo7aQLm mlbgErxEEQXYFm4oQPw4eexs8j32ff29ymerRI0TNyMHwXnCkg9Mknpf/2NJfei8KvKekJx39yA jIxyph19+IVfduX8p46ZpNUfuoTrdLnX/mf+SPQ5fWAYbzN+5FOPi3RA6YRf9Pb95giFerrFk1V YDglYjbl0ENV6/3+wWB/a8TtJTw+qNC/k/ZkXMKT/+yHaHMRq3vgHfFz3ZaYxxBeEsljy7UtPeI bN+oIeu1L9+592jWUOI4aPOUgQaaMc8SIz47YQVwgY34qjd/M1JQs81qDGExlBkk+zdftynHI3v 96GczBVKsW+wvqdnRXeEwvarKQKDweSpsAcMdme4qJjjcii4ULSa6R4zSSohJRP/NANEY5OTFQ9 3ux7JYp/6fLIeQkyK28/tqshIVtYQDcmmATJu90cVWdF3F4HWEZBL8ACdzfYtYk7eRWJiX+6YFH Wj2JRX8UwExSefTJPkA== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8cf0ec cx=c_pps a=lgz4Zsbfm4nnj/Www8P8jw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=t7CeM3EgAAAA:8 a=lZurfIDJcIjVqGklx3sA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: yTfiCMdNjR4p1N9JhrR76Zf2UNYhxgjY X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX1DScJJPDvVcp D8Nc3IhksDSB2jvF6bTdlfcAdOzNeEB5rgcwQr0rjljmAzZ6tCfvn7IezbSrl9HwMJ0J4i0ygr8 7CkcPU15aC2R7Q6q9oTo/SOdJJH6/1FfaKSf2dCKDRyDaGtr9Bon X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244177 The rpm package requires /usr/bin/pkg-config when it has .pc files. Fixed: 1) target-sdk-provides-dummy.bb: - package acl-dev-2.3.2-r0.core2_64 from oe-repo requires /usr/bin/pkg-config, but none of the providers can be installed 2) nativesdk-sdk-provides-dummy.bb: - package nativesdk-wayland-dev-1.24.0-r0.x86_64_nativesdk from oe-repo requires /usr/bin/pkg-config, but none of the providers can be installed Signed-off-by: Robert Yang Signed-off-by: Sumanth Gavini --- meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 1 + meta/recipes-core/meta/target-sdk-provides-dummy.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index 37dad54409..6075770bf0 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -11,6 +11,7 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ + /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \ " diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb index 65b87fd97d..ca155d0705 100644 --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb @@ -54,6 +54,7 @@ DUMMYPROVIDES = "\ /bin/bash \ /usr/bin/env \ /usr/bin/perl \ + /usr/bin/pkg-config \ libperl.so.5 \ libperl.so.5()(64bit) \ " From patchwork Tue Aug 25 01:33:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96234 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 4BFB8C61DBC for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12589.1787621615802137744 for ; Mon, 24 Aug 2026 18:33:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=pQ+PnNRk; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67ONKncq220298 for ; Tue, 25 Aug 2026 01:33:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=XddR0/jmFczF+a/KF7fzzJ59dUhFigBtOkt7u8ptAlw=; b= pQ+PnNRkEdeg5tZmwTlMxs/0w9Yru188YOgh/PvyyGhIQfdHpwSv/XpiBA51uLyJ 3Y+VLDc1Pb6zZJ1btMicw2Kor5/6Kibpyp/uIJLxZtddWC17tXFxESQjmqi1CpcQ dR9y2Y1QwIjUX/YxIMDcIu9CLU0LXlbNG2vhsfjOxThw0oym4hwOeAjQE9bQ9Gk2 Qvw7lOvHGUCkT4rQl7MgPsuvQSAFGPgdGApYqyDCaRsYJOAq+7REYIIjjYC1YAoI YHTjMWjl0NJWOklQJyLnD+dOKl39DhOylXR8whNJ4RpuWfjesGvrbb7eQPhZ4Q3o UVxwzI6ZvkSAdpGC1s0vHg== Received: from sj2pr03cu001.outbound.protection.outlook.com (mail-westusazon11022112.outbound.protection.outlook.com [52.101.43.112]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7100ktnr-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 25 Aug 2026 01:33:33 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=L6riB+ONcWOWm+3gwGoxxmpMeWGyQmXmZmvJobatfXG9Lcw7lp3RVwj9eVnDd9gv6hQbhHNYBT7cTLHOYEu3YdYbWp3mJPlpNF9V/aTbt8c+mSUjM92q3Q4k64QtIMDlAtxAaTi6YmMx8VEVF1+ZBO5YxEN3JHQELCFr4FKm2k4VVYswDL/6JJuGaG+dUg6ENII8Aj/7UXoL8+te3SFiRPU1LPURi+b4yJ2M8O3cXsVnpcqJe76Go5nFWr24I1hMedoHEvlRsjQ3Gpc3DROSrHEEj2CtmVq7lVSGq9Z0zuXsPI8LOQI+vOysnQJ5DADeqwY+i+rK0Epl4zJurgBzdQ== 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=XddR0/jmFczF+a/KF7fzzJ59dUhFigBtOkt7u8ptAlw=; b=BSmIgtStkoj9xaa7TTp09dm0Fr3pPN+OLGZ43p8RFHYxT/ZFFUgrJb4fP0QGjHkvPcGFUMrYIOLIw8if43A7IqvJ1IMJXYHDgZPk9fUpVf5PuXVLmVnJmcIzXp6Jn/e5tvSjnx6HgnObban6klowh0i+t2r+TDdV/khSkvLwn+XQEupcp/8BKyPSGleP80veKv4ilMcgJGoP5WuD0A2IM5OWAPp5KQKfF96Dy2X9wnMtAICR/FdVYoCBR3YEpLuKpufEGHQWBCYB0jQxdEyTvKxb3yj5PGKsBeB5L64Eya0WPsytZicjwN3YC2LJhhgtUNFAbOXOPVsRlA8QttHR4g== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:30 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:30 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 06/14] rpm: 4.20.1 -> 6.0.2 Date: Mon, 24 Aug 2026 18:33:04 -0700 Message-ID: <20260825013312.2695028-7-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: 74e3fd27-0583-415a-fd15-08df0248de88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|22082099003|18002099003|11063799006|56012099006|5023799004|13003099007|3023799007|38350700014|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: V8HLWhNpcrTkRHN+SmVipKF1v/7M+ORdAnxfivnhgDfK9JZVZRM5PIZYQYaCia0yIkcri5Ga88LtY1hm3U+JedWIy7AiMbQND9naqt6IlOd0qpPvWTr9YzKztmiww7Okl7qczNhQEqLBiQDq/1a9gNns5mMQKTALMy1gXcq1y8ElUcL+r4XAgVOUdG6zE+d71vzpuI/txpIBe3dfFvlJYV9s/DpSuhXdKu8sJx5qyythWlK+61mrbiYK+n5TkwKZvuSozrgDc6zgQjyp8/d+L/JJsZ+H7ihInkDiZ7by2JftUgt23y963EZhaInzsGxWnyI7/ga6n7hTAGbaKfhUe8ucGBDNxvNFJqfdxWvPhqlVc2y6Tsk6rev1aVA5gvUFRqCxMMLLIYsL1lQ/Fgxu3OgEFXuQXx/d28zf2qQxM0eLx2DpeKt4a2zfPTpcSGK5uJBNBO2gNG/QZLUKHhXg0pAyZnN/eyBFvt/d8xJWcPIzXAejVRtCRIaGmaMSJ78DWxmoJrth2ydMFKEV1ihVKe0xcb82ab/Tv5Cmc6XgjDptaryj1TztULPW6W7onieEl3WohBFePEMh6TXtFK1UuDyKeAptuR7kI5Ah2LkS1PIhxog6CdC5WiKm5u9QJefk5M26MbZefhpUHZ2OlRCNWTUe4LO1JmjRw0jAjT/KSfo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(22082099003)(18002099003)(11063799006)(56012099006)(5023799004)(13003099007)(3023799007)(38350700014)(6133799003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KxWHxy8FzpbR7AkpwRf4EQXkXhuZMzJfl96/RPwi5zvkd8LaB9nG2Ee5QFV6CDb6lN58onIWvsmMfa1IzLo6nup0mSxkQRDLUQkIPXckA2guYWB0U5GHXTwb1H50qMPpX9MgyPM5UgAclAcUI1XRAkAbC8sjPKA6+qSgmNtLveKSfAufVLtcTO4VnKuHeF1zmTeS2WTGbG6ZirhuFWeUtUWt7KtLPemoNaFx7yAKxje0HASZ43U69W2pM0AJuDM5A6tc35E3Qtfb3afdiVgMiqc/EflkE6LbK8fdQoWMXRahmYqkH3I/zxXyHYMZe9rXtSxSPagiF8pJNoGw9264v1TtW3hduk4LsFTXQ0QKyxM4AOdySyFDy8pQUbB0SddJQSs4gSpV8i8/C9vtBkZ2p6XpNwSQmSto4k/X5Z8sZwmpotprIB9dj8C6+QOPNhes6VeH2djA0EdDLTgRLfix/n/hCvELFDEu3xqPV74wiLKBFzmhYuAjJW1LcF5coWSy/Sf7aPWJmd/GYuqPoD+xtBCwUguVXzoU1IT7y5ZXp+QjlMdDIoshG/ZVqMOOBWOZEeblstuggJ/I/VfY/9fxVXKqXApkURRC5OQWxjkFJ3KMQK4/ZqTGfaSOghhCgbDLKApTvkRO5y6MWo4n4GOGsg1zBlBTInwjcy2Ikug2Sza3NIoHkX8Nbnyl1TImj2sndllwaj++puJcDXVZXCYDHgIxGEwLBuAhos9UzaJO6q7RDP/C/sosYVtt8AiT6P1HF/9sByrEunILflI1IYHVmzKWT1Ejdb9WQ+Ue7rHk2VH/q1LNBU1g5DqiTUW3Gs5U8lp1QPbLBn8nH+CWWQc6ip+HPxrbcvpktIaS3j58gymC7hWNyVdqfZ6a2v3mZ3Q2c124nSTb8HwM2bPL0L9avP3xmRjD3R/TjSklSRHu8bw+FsllWpXEU5Fi//5daX9EicrnWbLPG3o3LefEZni4ipmS94qIHIy3njKM7IKcX0TYF8G+GKvXkda2o2sYIKE4Cao5TQrN5tifo4M4dTqBEyymHYCdigUt+hmJorcN4iWTZc3NKJ+8Lh/URMgjjGaz9sHoZurxoWvj0vFDC4Uj7L/bohzYG0ptYW7a36UoOWRtnPdEuRxpmhkxNRU9tCkkiBR4YOyH50Lk5nhLenhgYeOaro9WIsgeWDuRApUzuxi6cJEKSu+kICoKdgmvkhw4KTdjlgVoL68Foa63Q96jGnNqtRJI3pYqbOnceQipamURhtou1RtqMo0Win/gdyXCeVWj7M51eXI/dJKFFeDm1w9PIHjRgmaE52FgVOK1eBOSDo7or2Lf5UJEvmdjmdyZAYp1AXy2Id5lrVH8KUAH+jY5oXtD7EkoC4Sn5JMgRNOa7AzLMknPa7CLAgtBLtil8U1j+Xba+tq3bOmz56nqFj0y2fzyXElPyQ4xNP1bH3N814yxvcFdenm2f5kN0j3vYOuJjb7wuCSHFl6fKp9o50J9ZdinVHul/UKWx71gix3dPnpu2lx0Jx5lYnFKOYxK8o159rFZsYBhHCYIZPoMGyBUmTkZctek4X+ETZ6Nww7UBrNzc+ggIpu2i0NV8GeeD9nHbh+bMrZW+zmG0P1MNBNdeA0P02jKfQ4z5v3MyxYIo8Ga2KA25GC6rjZzGFQ0fs58pOZdEj5NDM6k+BCvQIvTDb5AFwtI99XES4x9c2HSGJCTmfW5qK8aNFBXsgDYaTq8n6kuWhbl4gSVKkQ6xiCcBp52CLhdoQUPR5VG8r0= X-Exchange-RoutingPolicyChecked: TMNnPS0gl/g7LAeA6e5Kseu9vATK5F25IgjI8Z08L3Dx0461cpbwbGEQMHer25vWAcg+xywVxQu/rTn0ErZer+/0coIsRw97Uk4udrT54XeKAf70n0YXFt0q/OfTG2K7DLBkfA3AdqDdHNBkHd6TlXEHX4oPmVsT3Y2Z1iK7yFc7fsPo/8jbrihdn23io8fqC/nKJH1FQiEM2aQ5oHibAg8cILGJlQXHdbVWlNeHA28juR+Dtd0h8Hf+o5q3aNv+X5wmPsIAWk985+IQohITJ42yACQuNicD0p2fPTu4F0b9IVowk5S6YDlVO42rGDaP/SeL6bMejImc/nxvgD9ZRg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74e3fd27-0583-415a-fd15-08df0248de88 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:30.5725 (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: NuCwOIsPS2/1vm2JKaC5g25liSNCcMsL6A/6gMcmPxMQMk9bkeKSpHRaUQxk/W4S1guYOBIAkA/dDALEuFtVPcn1Xm/nN9EFcdw9g5sD8zQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: Gb7D8P5qLbWDrWZDholxq9N4iwdCVsPD X-Authority-Analysis: v=2.4 cv=UaJhjqSN c=1 sm=1 tr=0 ts=6a8cf0ee cx=c_pps a=p4c3Up3QyKVVMVBhHExQxQ==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=klDOsUkWDRETUCZYPvoE:22 a=NEAV23lmAAAA:8 a=Q4-j1AaZAAAA:8 a=GMGn13PZAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=Ia9td_k3mc_TV5fArrgA:9 a=2yX8oE26ukr_L8MB:21 a=O8hF6Hzn-FEA:10 a=9H3Qd4_ONW2Ztcrla5EB:22 a=jIF0orF5dxDFSsn8Ms5I:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: 7c58Gr7gDh7JpmNoolE0mXkeevzEYL08 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX5vM2F/UNjA94 EIu4Am5Lal6SLts/5LMIcmPQZSW0tkJI0ZpitghS1tPxE0mcU4pHxlyM5DmBx20BVJJ9yqxoRuq CjmkpxrPbX9ORIa6WV+Vq6ybwC/YqYXRAmaRcSNdLJuwZpgMRgYX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX2G9ZaO1u/R76 y3e2EoGtNWqkload0DRfHkv/P2yr3+DyNBXQj5j2v9zn+JXoIecYQAaFs3lka9gIrl3SW9Q6QKQ MrZzfitJuXou25pSCuZk9CGXx5hHOPhlNxyVT6W+awnczfyAXEPnvCLVnodzpy6euOUicRC0iWt ig8CUOJdja0NkxPeQghkMTChacOCfjfmcaN+pmVlXEwcJeWexbckbH9zSB/3F0PVsCSIJqQUzFE axghh/aZE1SX6zmy0MsAkNA4aa8HR5DL+TSXw+BiTa3wgxfkzSLljjH1YqJaxA/z664MKaKrwgh dsKNqCntZSr2oVdcRWMpkBXMgSzqktC70d33rxuWsxGOLo8r1Csh8F7O+ysekbQYBoQoHkqYgQh fb3O1HUgepzpVOgxxyQtYVCh0EK462v93K6c7FbXjKgtILqpWa41/5yyu2yPe7xy5HFTa3UiJGs s/rejsFKh3vugioZ5Sg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 adultscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244178 * Add a tag to SRC_URI so that there will be errors when only change the filename during upgrade it, as suggested by Alexander. * Rebase the following patch: - 0001-Add-a-color-setting-for-mips64_n32-binaries.patch - 0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch - 0001-Do-not-read-config-files-from-HOME.patch - 0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch - 0001-When-cross-installing-execute-package-scriptlets-wit.patch - 0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch - 0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch - 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch - 0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch - 0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch * Updated 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch Remove the changes for macros.in since it doesn't work for rpmbuild, rpmbuild is like cross build, will define the values in package_rpm.bbclass. * Remove 0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch, there are no such warnings in rpm 6.0.2. * Remove backported patch 0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch * Add the following patches: - 0001-tools-elfdeps.cc-Remove-format-module.patch There is no format until gcc 13.1, so remove the format module to make it work on hosts such as Ubuntu 22.04. - 0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch Fixed: GPG check FAILED * Fix filter /usr/bin/pkg-config file dependency pkg-config is a build-time tool, not a runtime dependency. Filter the /usr/bin/pkg-config file dependency that RPM pkgconfig.attr auto-detects for packages with .pc files, preventing unnecessary hard dependencies in -dev packages. * Add scdoc-native to DEPENDS to fix do_configure error for both native and target: Could not find SCDOC using the following names: scdoc Note, both target and native need scdoc-native, it is used for generating the manual, the man pages in *man/* are scdoc sources * Add /etc/rpm to nativesdk-rpm to fix: ERROR: nativesdk-rpm-1_6.0.1-r0 do_package: QA Issue: nativesdk-rpm: Files/directories were installed but not shipped in any package: /etc /etc/rpm * Add /etc/rpm to nativesdk-rpm to fix: * Fix build with systemd, the rpm's sysuser creation doesn't work with cross build, and we don't need rpm to create the users since we have useradd.bbclass. The fix is: cmd = cmd + " --define '__sysusers_path %{nil}'" The error is: /var/tmp/rpm-tmp.U4iaJX: line 114: tr: command not found * Make rpmbuild can find the pkgconfig (.pc) files in /usr/share/pkgconfig: cmd = cmd + " --define '_datadir ${datadir}'" The error is: - nothing provides pkgconfig(shared-mime-info) needed by libgdk-pixbuf-2.0-dev-2.44.5-r0.x86_6 Signed-off-by: Sumanth Gavini --- meta/classes-global/package_rpm.bbclass | 4 ++ ...olor-setting-for-mips64_n32-binaries.patch | 22 ++++---- ...akeLists.txt-Fix-checking-for-CFLAGS.patch | 46 ----------------- ...et-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch | 50 ------------------- ...satisfiable-dependency-when-building.patch | 18 ++++--- ...lib-rpm-as-the-installation-path-for.patch | 24 +++------ ...1-Do-not-read-config-files-from-HOME.patch | 18 ++++--- ...-PATH-environment-variable-before-ru.patch | 16 +++--- ...lling-execute-package-scriptlets-wit.patch | 12 +++-- ...not-insert-payloadflags-into-.rpm-me.patch | 18 ++++--- ....c-fix-file-conflicts-for-MIPS64-N32.patch | 18 ++++--- ...kgverify_level-to-digest-as-RCPM-4.2.patch | 35 +++++++++++++ ...ools-elfdeps.cc-Remove-format-module.patch | 38 ++++++++++++++ ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 26 ++++++---- ...avoid-using-GLOB_BRACE-if-undefined-.patch | 14 ++++-- ...ge-logging-level-around-scriptlets-t.patch | 14 +++--- .../rpm/{rpm_4.20.1.bb => rpm_6.0.2.bb} | 14 +++--- 17 files changed, 199 insertions(+), 188 deletions(-) delete mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch create mode 100644 meta/recipes-devtools/rpm/files/0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch create mode 100644 meta/recipes-devtools/rpm/files/0001-tools-elfdeps.cc-Remove-format-module.patch rename meta/recipes-devtools/rpm/{rpm_4.20.1.bb => rpm_6.0.2.bb} (96%) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 9af4cbdd94..51ad195baa 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -587,6 +587,7 @@ python do_package_rpm () { cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" cmd = cmd + " --define '_lib ${BASELIB}'" cmd = cmd + " --define '_libdir ${libdir}'" + cmd = cmd + " --define '_datadir ${datadir}'" cmd = cmd + " --define '_builddir " + d.getVar('B') + "'" cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" @@ -601,6 +602,7 @@ python do_package_rpm () { cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'" + cmd = cmd + " --define '__sysusers_path %{nil}'" cmd = cmd + " --define '_use_weak_usergroup_deps 1'" cmd = cmd + " --define '_passwd_path " + "/completely/bogus/path" + "'" cmd = cmd + " --define '_group_path " + "/completely/bogus/path" + "'" @@ -622,6 +624,8 @@ python do_package_rpm () { python () { if d.getVar('PACKAGES') != '': deps = ' rpm-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' + # The pkgconfig-native is required by rpm's pkgconfigdeps.sh + deps += ' pkgconfig-native:do_populate_sysroot' d.appendVarFlag('do_package_write_rpm', 'depends', deps) d.setVarFlag('do_package_write_rpm', 'fakeroot', '1') diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch index 769d7b3409..a808009058 100644 --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch @@ -5,16 +5,20 @@ Subject: [PATCH] Add a color setting for mips64_n32 binaries Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - build/rpmfc.c | 4 ++++ + build/rpmfc.cc | 4 ++++ rpmrc.in | 2 ++ 2 files changed, 6 insertions(+) -diff --git a/build/rpmfc.c b/build/rpmfc.c -index 86dd36d14..df421a23f 100644 ---- a/build/rpmfc.c -+++ b/build/rpmfc.c -@@ -716,6 +716,7 @@ static int rpmfcHelper(rpmfc fc, int *fnx, int nfn, const char *proto, +diff --git a/build/rpmfc.cc b/build/rpmfc.cc +index 833e56fa8..d50a3407f 100644 +--- a/build/rpmfc.cc ++++ b/build/rpmfc.cc +@@ -690,6 +690,7 @@ static int rpmfcHelper(rpmfc fc, int *fnx, int nfn, const char *proto, static const struct rpmfcTokens_s rpmfcTokens[] = { { "directory", RPMFC_INCLUDE }, @@ -22,7 +26,7 @@ index 86dd36d14..df421a23f 100644 { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, -@@ -1258,6 +1259,9 @@ static uint32_t getElfColor(const char *fn) +@@ -1191,6 +1192,9 @@ static uint32_t getElfColor(const char *fn) color = 0; break; } @@ -33,10 +37,10 @@ index 86dd36d14..df421a23f 100644 if (elf) elf_end(elf); diff --git a/rpmrc.in b/rpmrc.in -index 8646a966b..7349fdfd3 100644 +index 8fd0d7ee1..4cc52ceb3 100644 --- a/rpmrc.in +++ b/rpmrc.in -@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 +@@ -152,6 +152,8 @@ archcolor: mipsr6el 1 archcolor: mips64r6 2 archcolor: mips64r6el 2 diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch deleted file mode 100644 index 412e1c146d..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e14502834fe6a9c6c9a439401ac3d2c8fd979267 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Sun, 8 Jun 2025 00:36:38 -0700 -Subject: [PATCH] CMakeLists.txt: Improve checking for CFLAGS - -The previous log wasn't clear: --- Performing Test found --- Performing Test found - Success --- Performing Test found --- Performing Test found - Success --- Performing Test found --- Performing Test found - Failed - -Use a new var compiler-supports${flag} will make it more clear: --- Performing Test compiler-supports-fno-strict-overflow --- Performing Test compiler-supports-fno-strict-overflow - Success --- Performing Test compiler-supports-fno-delete-null-pointer-checks --- Performing Test compiler-supports-fno-delete-null-pointer-checks - Success --- Performing Test compiler-supports-fhardened --- Performing Test compiler-supports-fhardened - Failed - -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/e14502834fe6a9c6c9a439401ac3d2c8fd979267] - -Signed-off-by: Robert Yang ---- - CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 08e3e5274..f275c396b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -416,11 +416,10 @@ endif() - - # try to ensure some compiler sanity and hardening options where supported - foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened) -- check_c_compiler_flag(${flag} found) -- if (found) -+ check_c_compiler_flag(${flag} compiler-supports${flag}) -+ if (compiler-supports${flag}) - add_compile_options(${flag}) - endif() -- unset(found) - endforeach() - - # generated sources diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch deleted file mode 100644 index 7db643871f..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cb5355da9b47166253dbe5ab3215e433b55068d1 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Fri, 26 Jul 2024 17:18:30 +0800 -Subject: [PATCH] CMakeLists.txt: set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} in - macros - -There is a patch in oe-core[1] to avoid hardcoded paths in macros. It -tries to use libdir to expand %_libdir in macros.in. However, in -upstream commit[2], libdir for macros in CMakeLists.txt is set to -${prefix}/=LIB=, which causes %_libdir to expand to ${prefix}/=LIB= -instead of the correct path in the final macros. - -On target: -$ rpm --showrc | grep _libdir -[snip] --13: _libdir ${prefix}/=LIB= -[snip] - -This also causes %__pkgconfig_path in fileattrs/pkgconfig.attr to become -an invalid regular expression when building rpm packages. This results a -warning in log.do_package_write_rpm in all packages: - -Warning: Ignoring invalid regular expression ^((${prefix}/=LIB=|usr/share)/pkgconfig/.*.pc|usr/bin/pkg-config)$ - -Set libdir to ${CMAKE_INSTALL_FULL_LIBDIR} instead of ${prefix}/=LIB= to -make sure it is expanded to the correct path in macros. - -[1] https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch -[2] https://github.com/rpm-software-management/rpm/commit/d2abb7a48760418aacd7f17c8b64e39c25ca50c9 - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Yi Zhao ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 08dabffd3..1b7661139 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -96,7 +96,7 @@ function(makemacros) - set(sysconfdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}") - set(sharedstatedir "${CMAKE_INSTALL_FULL_SHAREDSTATEDIR}") - set(localstatedir "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}") -- set(libdir "\${prefix}/=LIB=") -+ set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") - set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - set(oldincludedir "${CMAKE_INSTALL_FULL_OLDINCLUDEDIR}") - set(infodir "\${prefix}/${CMAKE_INSTALL_INFODIR}") diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch index 96a5e14999..63a10df0d5 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch @@ -9,16 +9,20 @@ hand produces rpms that way by design. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - build/pack.c | 4 ---- + build/pack.cc | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/build/pack.c b/build/pack.c -index eb9c7b3f1..fb1f1bed8 100644 ---- a/build/pack.c -+++ b/build/pack.c -@@ -712,10 +712,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch - headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); +diff --git a/build/pack.cc b/build/pack.cc +index 49c9d0a58..b1cda6d75 100644 +--- a/build/pack.cc ++++ b/build/pack.cc +@@ -805,10 +805,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch + headerPutBin(pkg->header, RPMTAG_SOURCESIGMD5, spec->sourcePkgId,16); } - if (cheating) { diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 6a44f4f22d..309320cf43 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch @@ -6,10 +6,16 @@ Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] Signed-off-by: Alexander Kanavin + +Updated for rpm 6.0.2: +Remove the changes for macros.in since it doesn't work for rpmbuild, rpmbuild +is like cross build, will define the values in package_rpm.bbclass. + +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- CMakeLists.txt | 2 +- - macros.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de0b578a6..9a3aba071 100644 @@ -23,17 +29,3 @@ index de0b578a6..9a3aba071 100644 +set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") set(RPM_MACROSDIR "${RPM_CONFIGDIR}/macros.d") set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") - -diff --git a/macros.in b/macros.in -index 4d3e8afdc..66e31320f 100644 ---- a/macros.in -+++ b/macros.in -@@ -964,7 +964,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ - %_sharedstatedir %{_var}/lib - %_localstatedir %{_prefix}/var - %_lib lib --%_libdir %{_exec_prefix}/%{_lib} -+%_libdir @libdir@ - %_includedir %{_prefix}/include - %_infodir %{_datadir}/info - %_mandir %{_datadir}/man diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch index bfc9a74b6c..ae47499e22 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch @@ -5,15 +5,19 @@ Subject: [PATCH] Do not read config files from $HOME Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - lib/rpmrc.c | 6 ++---- + lib/rpmrc.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/lib/rpmrc.c b/lib/rpmrc.c -index 5d778b8b7..dc8d42aeb 100644 ---- a/lib/rpmrc.c -+++ b/lib/rpmrc.c -@@ -485,8 +485,7 @@ static void setDefaults(void) +diff --git a/lib/rpmrc.cc b/lib/rpmrc.cc +index 2b3baeddc..cea6f4bc5 100644 +--- a/lib/rpmrc.cc ++++ b/lib/rpmrc.cc +@@ -390,8 +390,7 @@ static void setDefaults(void) if (!defrcfiles) { defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", confdir, "/" RPM_VENDOR "/rpmrc", ":", @@ -23,7 +27,7 @@ index 5d778b8b7..dc8d42aeb 100644 } /* macrofiles may be pre-set from --macros */ -@@ -498,8 +497,7 @@ static void setDefaults(void) +@@ -403,8 +402,7 @@ static void setDefaults(void) confdir, "/" RPM_VENDOR "/macros", ":", SYSCONFDIR "/rpm/macros.*", ":", SYSCONFDIR "/rpm/macros", ":", diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch index d3263896ef..05c8b79f29 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch @@ -8,15 +8,19 @@ We add lots of native stuff into it and scriptlets rely on that. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - lib/rpmscript.c | 2 +- + lib/rpmscript.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/rpmscript.c b/lib/rpmscript.c -index 060fd8124..4dc6466a8 100644 ---- a/lib/rpmscript.c -+++ b/lib/rpmscript.c -@@ -251,7 +251,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, +diff --git a/lib/rpmscript.cc b/lib/rpmscript.cc +index b75a62085..2d7a4c889 100644 +--- a/lib/rpmscript.cc ++++ b/lib/rpmscript.cc +@@ -260,7 +260,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, if (ipath && ipath[5] != '%') path = ipath; diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch index b71156fe12..90f5322573 100644 --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch @@ -26,15 +26,17 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin Rebased to 4.20.1 +Rebased to 6.0.2 Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - lib/rpmscript.c | 9 +++++++-- + lib/rpmscript.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -diff --git a/lib/rpmscript.c b/lib/rpmscript.c -index eb14870b3..1785e8f30 100644 ---- a/lib/rpmscript.c -+++ b/lib/rpmscript.c +diff --git a/lib/rpmscript.cc b/lib/rpmscript.cc +index b75a62085..7d667b7f5 100644 +--- a/lib/rpmscript.cc ++++ b/lib/rpmscript.cc @@ -456,8 +456,7 @@ exit: Fclose(out); /* XXX dup'd STDOUT_FILENO */ diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch index 0c29e5543a..fe4e029830 100644 --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch @@ -1,7 +1,7 @@ From e688eb54fd54d65181e94b854b3568d99cbf3a24 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 31 Aug 2021 10:37:05 +0200 -Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata +Subject: [PATCH] build/pack.cc: do not insert payloadflags into .rpm metadata The flags look like '19T56' where 19 is the compression level (deterministic), and 56 is the amount of threads (varies from one @@ -9,15 +9,19 @@ host to the next and breaks reproducibility for .rpm). Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - build/pack.c | 2 +- + build/pack.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build/pack.c b/build/pack.c -index fb1f1bed8..45885a6ac 100644 ---- a/build/pack.c -+++ b/build/pack.c -@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) +diff --git a/build/pack.cc b/build/pack.cc +index b1cda6d75..1425d27ba 100644 +--- a/build/pack.cc ++++ b/build/pack.cc +@@ -338,7 +338,7 @@ static char *getIOFlags(Package pkg) headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); buf = xstrdup(rpmio_flags); buf[s - rpmio_flags] = '\0'; diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch index 7d443ccc6c..5dc059493c 100644 --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch @@ -1,7 +1,7 @@ From ad530868e37f09e9236c085d25a834304750704b Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 7 May 2020 17:40:58 +0800 -Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 +Subject: [PATCH] lib/transaction.cc: fix file conflicts for MIPS64 N32 This patch is from: https://github.com/rpm-software-management/rpm/issues/193 @@ -27,15 +27,19 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". Upstream-Status: Submitted Signed-off-by: Changqing Li + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - lib/transaction.c | 13 ++++++++++++- + lib/transaction.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -diff --git a/lib/transaction.c b/lib/transaction.c -index 5e4414d2a..b1c55bd44 100644 ---- a/lib/transaction.c -+++ b/lib/transaction.c -@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, +diff --git a/lib/transaction.cc b/lib/transaction.cc +index de7cdabb2..697268733 100644 +--- a/lib/transaction.cc ++++ b/lib/transaction.cc +@@ -375,7 +375,18 @@ static int handleColorConflict(rpmts ts, rpmfsSetAction(ofs, ofx, FA_CREATE); rpmfsSetAction(fs, fx, FA_SKIPCOLOR); rConflicts = 0; diff --git a/meta/recipes-devtools/rpm/files/0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch b/meta/recipes-devtools/rpm/files/0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch new file mode 100644 index 0000000000..500a667a1b --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch @@ -0,0 +1,35 @@ +From 1cb53934b83b794c319813106c9f12d75cce66d2 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Sun, 18 Jan 2026 19:24:42 -0800 +Subject: [PATCH] macros.in: Set _pkgverify_level to digest as RPM 4.20.1 + +Fixed: +$ bitbake core-image-minimal +Package bash-5.3-r0.16.x86_64_v3.rpm is not signed +GPG check FAILED + +Set _pkgverify_level to digest as RPM 4.20.1 can fix the problem. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini +--- + macros.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/macros.in b/macros.in +index 38066f00c..7fe00ad09 100644 +--- a/macros.in ++++ b/macros.in +@@ -680,7 +680,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ + # signature require valid signature(s) + # digest require valid digest(s) + # none traditional rpm behavior, nothing required +-%_pkgverify_level all ++%_pkgverify_level digest + + # Disabler flags for package verification (similar to vsflags) + # Set to 0x0 for full compatibility with v4 packages. +-- +2.49.0 + diff --git a/meta/recipes-devtools/rpm/files/0001-tools-elfdeps.cc-Remove-format-module.patch b/meta/recipes-devtools/rpm/files/0001-tools-elfdeps.cc-Remove-format-module.patch new file mode 100644 index 0000000000..25f5496bde --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-tools-elfdeps.cc-Remove-format-module.patch @@ -0,0 +1,38 @@ +From 3536ef6bb74144cf9dce10200cd62c2ad9f7cae4 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 15 Jan 2026 19:36:17 -0800 +Subject: [PATCH] tools/elfdeps.cc: Remove format module + +There is no format until gcc 13.1, so remove the format module to make it work +on hosts such as Ubuntu 22.04. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini +--- + tools/elfdeps.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tools/elfdeps.cc b/tools/elfdeps.cc +index 17884b24e..33ff8d740 100644 +--- a/tools/elfdeps.cc ++++ b/tools/elfdeps.cc +@@ -1,6 +1,5 @@ + #include "system.h" + +-#include + #include + #include + +@@ -105,7 +104,7 @@ static void addSoDep(std::vector & deps, + if (ver.empty() && marker.empty()) { + addDep(deps, soname); + } else { +- auto dep = std::format("{}({}){}", soname, ver, marker); ++ std::string dep = soname + "(" + ver + ")" + marker; + addDep(deps, dep); + } + } +-- +2.49.0 + diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch index 082fb343c2..1004253ff8 100644 --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch @@ -9,15 +9,19 @@ from target rootfs instead of its own native sysroot. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - lib/rpmrc.c | 18 +++++++++++++----- + lib/rpmrc.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -diff --git a/lib/rpmrc.c b/lib/rpmrc.c -index dc8d42aeb..3f2996850 100644 ---- a/lib/rpmrc.c -+++ b/lib/rpmrc.c -@@ -481,11 +481,14 @@ static void setDefaults(void) +diff --git a/lib/rpmrc.cc b/lib/rpmrc.cc +index cea6f4bc5..e6cf21e1b 100644 +--- a/lib/rpmrc.cc ++++ b/lib/rpmrc.cc +@@ -386,11 +386,14 @@ static void setDefaults(void) userrc = xstrdup(oldrc); } } @@ -33,7 +37,7 @@ index dc8d42aeb..3f2996850 100644 } /* macrofiles may be pre-set from --macros */ -@@ -495,9 +498,9 @@ static void setDefaults(void) +@@ -400,9 +403,9 @@ static void setDefaults(void) confdir, "/platform/%{_target}/macros", ":", confdir, "/fileattrs/*.attr", ":", confdir, "/" RPM_VENDOR "/macros", ":", @@ -46,7 +50,7 @@ index dc8d42aeb..3f2996850 100644 } free(usermacros); -@@ -1142,7 +1145,11 @@ static void read_auxv(void) +@@ -1048,7 +1051,11 @@ static void read_auxv(void) */ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) { @@ -55,11 +59,11 @@ index dc8d42aeb..3f2996850 100644 + if (etcconfdir == NULL) + etcconfdir = ""; + -+ const char * const platform_path = rstrscat(NULL, etcconfdir, SYSCONFDIR "/rpm/platform", NULL); ++ char * const platform_path = rstrscat(NULL, etcconfdir, SYSCONFDIR "/rpm/platform", NULL); static struct utsname un; char * chptr; - canonEntry canon; -@@ -1462,6 +1469,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) + int rc; +@@ -1378,6 +1385,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) if (arch) *arch = un.machine; if (os) *os = un.sysname; diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch index 00fe19108e..59855466da 100644 --- a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch @@ -1,7 +1,7 @@ From d8972ff7fa0a30e199144ba135223bf561874e01 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 16 Jan 2024 09:59:26 +0100 -Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C +Subject: [PATCH] rpmio/rpmglob.cc: avoid using GLOB_BRACE if undefined by C library This addresses musl failures; if there is code out there relying on @@ -11,14 +11,18 @@ This is unlikely to be trivially fixable upstream. Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] Signed-off-by: Alexander Kanavin + +Rebased to 6.0.2 +Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - rpmio/rpmglob.c | 6 ++++++ + rpmio/rpmglob.cc | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c +diff --git a/rpmio/rpmglob.cc b/rpmio/rpmglob.cc index eb439cad8..1eef0b851 100644 ---- a/rpmio/rpmglob.c -+++ b/rpmio/rpmglob.c +--- a/rpmio/rpmglob.cc ++++ b/rpmio/rpmglob.cc @@ -33,6 +33,12 @@ #include "debug.h" diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch index bac2d6331c..84f909c68b 100644 --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch @@ -1,7 +1,7 @@ From 452b696ea3e1975ea30cf7a92678aa4b316e6300 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 10 Jan 2019 18:14:18 +0100 -Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO +Subject: [PATCH] rpmscript.cc: change logging level around scriptlets to INFO from DEBUG That way we can debug scriptlet failures without writing lots of @@ -11,15 +11,17 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin Rebased to 4.20.1 +Rebased to 6.0.2 Signed-off-by: Robert Yang +Signed-off-by: Sumanth Gavini --- - lib/rpmscript.c | 8 ++++---- + lib/rpmscript.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/lib/rpmscript.c b/lib/rpmscript.c -index e9f288ae0..f0c628708 100644 ---- a/lib/rpmscript.c -+++ b/lib/rpmscript.c +diff --git a/lib/rpmscript.cc b/lib/rpmscript.cc +index fe5fc9138..861fd8ca8 100644 +--- a/lib/rpmscript.cc ++++ b/lib/rpmscript.cc @@ -299,7 +299,7 @@ static char * writeScript(const char *cmd, const char *script) if (Ferror(fd)) goto exit; diff --git a/meta/recipes-devtools/rpm/rpm_4.20.1.bb b/meta/recipes-devtools/rpm/rpm_6.0.2.bb similarity index 96% rename from meta/recipes-devtools/rpm/rpm_4.20.1.bb rename to meta/recipes-devtools/rpm/rpm_6.0.2.bb index 17e75c3e14..e8977aa31a 100644 --- a/meta/recipes-devtools/rpm/rpm_4.20.1.bb +++ b/meta/recipes-devtools/rpm/rpm_6.0.2.bb @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=066ecde17828e5c8911ec9eae8be78f4" -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protocol=https \ +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-6.0.x;protocol=https \ file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \ file://0001-Do-not-read-config-files-from-HOME.patch \ file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \ @@ -37,14 +37,14 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protoc file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ - file://0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch \ - file://0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch \ + file://0001-tools-elfdeps.cc-Remove-format-module.patch \ + file://0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch \ " PE = "1" -SRCREV = "c8dc5ea575a2e9c1488036d12f4b75f6a5a49120" +SRCREV = "a7f89afb57a98f6419d0eff35ca792198293b682" -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd scdoc-native" DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" EXTRA_OECMAKE:append = " -D__CURL:FILEPATH=curl" @@ -154,7 +154,8 @@ do_install:append () { FILES:${PN} += "${libdir}/rpm-plugins/*.so \ " -FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/rpm.sh \ + /etc/rpm" FILES:${PN}-dev += "${libdir}/rpm-plugins/*.la \ " @@ -181,6 +182,7 @@ FILES:${PN}-build = "\ ${libdir}/rpm/mkinstalldirs \ ${libdir}/rpm/macros.p* \ ${libdir}/rpm/fileattrs/* \ + ${libdir}/rpm/rpm-setup-autosign \ " FILES:${PN}-sign = "\ From patchwork Tue Aug 25 01:33:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96226 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 30D4BC61DB9 for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12511.1787621617067319347 for ; Mon, 24 Aug 2026 18:33:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=fTAOJbbS; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67ONhIr23880365 for ; Tue, 25 Aug 2026 01:33:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=XdMqEUZTMTUVZfQmnzmYhqouDJTd7RYT1b0MFw8peJg=; b= fTAOJbbSNq5RuE884kkmfHm/03/+jx7X8SfB1wPE1niolFFFy734gskKtg7jsml9 m8Ac5psly3G8CDZ2uO06QQXIfrm73uaTV5dzyXnMyvnZhUHLmWIUOQZ52TM4uAVg gTpmEY8uCDPNDQkcfsTaX9rPYMb/y9IXAu61T5wCJwGfERnyGB/QCGTuq3E8PPoU ZNiabH8gTQbRVw0XHg9qAlQeTaOqnJpVnRN2nOGwNe2yM5E7Nz8XeUP0Iwu2YLNb qwmBgqisB6qEscNlPIwXr9GmUBrTyqc390djeorqHELx008l2Uxc9sBuI4NpbEHj lYbaX56aDlB50Q0cUP1NOg== Received: from sj2pr03cu001.outbound.protection.outlook.com (mail-westusazon11022093.outbound.protection.outlook.com [52.101.43.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6uqvw-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 25 Aug 2026 01:33:35 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g6ZBvCjdhpMBaYhB7D/ohE8ayklKcFFnmKpQaWbUGDnVyDYFFGcVhMw3MS5yMDTu1EoE6ernLmD3HNAn7dNwRzugWqR+c4YATd2U6bQbrIVSpHsu+g/APfXI6unc/4auMqlRNgDF7x1ovF8lhc1JwJoWNQwxiqvVVi4NeSBEnkNZSGe372HoD8+tsKBW/DIqA/MHV1Sf40xLqm6dJu8+A/axzKodo7pLGNlYKMsQ1pStAed8FWpCfa4wJ9D1scYZdj+9oemm583N/wDZgrfwPxQcK4y6LMsNX2og/dL089nKHJcVjLVVZ0vA0HDLy5iiARBWgE/lfKEfw18o+ttEug== 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=XdMqEUZTMTUVZfQmnzmYhqouDJTd7RYT1b0MFw8peJg=; b=UoTgI1swJMmzbmkTqVXzcflurtJlNAYeHYSWf+aNAqCAEk9aZjWcJOqgI4d48MsLycQPWdvFMB6vKdzCKliDbZrvkygbVja2bbEC0N6qZMR9yODAwlvnbfGu2u39QyC6GdFXmqS3CseK6GOX9oXPABEOeOqpUW8IkETXyOnBJPGhp4az4F8ssLP5Ov+Iuh3Zx8PUYjXO/FBLHBA/TnJ64c68y6tcGA6qJFWJm20Ozj96piCgTIb53mKpNOz9JOsAD3YLYwZSuvygnkVxgSPQ8K6oNCTPX9NANi/K+0u9AwfK3KuCM1w8UpWWRoM9ww/9rNIcTts+4TeXTzS7j6Ekeg== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:31 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:31 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 07/14] libarchive: Make it work with rpm 6.0.2 Date: Mon, 24 Aug 2026 18:33:05 -0700 Message-ID: <20260825013312.2695028-8-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d3d3938-42bf-493c-a1a2-08df0248df1d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|12006099003|22082099003|18002099003|11063799006|56012099006|13003099007|38350700014|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: 2413AtWxeCBKVgmndvwB4h4sP46LGLt27Bl9LeZAPUyEWysktZI1ekdxThGWu95WvELcJMcLBu7ZhEOnA6Z9mqcf8l/u8ESQnDlyIACg44u+5qtVooY5uwFZELZzvCdFM2AzgvYvjxYxLHddTA3iqQD0Sqa8avGZ7OQCoAzUqcHRjMaShbrNa+Ox8ejF0yZhUR88YAeASpHwXjHH+FMdpAuHz4nXTydrNVO9oQXye8wZS6Kz2FH8yA7bUKa5Nr30yQy4UEYb1DvjulJs2drhI9+Mge/b0texEVWMT7SXxQGn7DwMyiY0nlPEp/A14Ia0iLfIWM2pu2Se0+IrPOqg3aLIPx02lrc0DpSemCfkWgyqpESziNPNnnM4Zs9JYA4OH02sZ7SKdZSiyQasNEolL4Kk7NDCgdggDGRAoDdRQUlyZ3DzUufxz3DWm9/DP08ZOVP6Gq2OU/+4rcmpCftiAiLP/ILpG5SkE6Nkd9McP4fuS51rZ2Z8wdLHQLTJjsiZhsi2imrxNxafBd4U/jXQ2vambFAB/bU718DKIF+2t1dQ3TFiXvY1xThYrlHeoZzHRqXlxW5Dtjly2xW5OhONsHX4JKCdqASv02ufCR7OrnsBbMC/sY5e3dtg6w7CUhaevx4ogTHN6xaf46lIS8ZfmKaGOGBF8xiwXFc9psQU2sE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(12006099003)(22082099003)(18002099003)(11063799006)(56012099006)(13003099007)(38350700014)(6133799003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5++2MKgSyXuwyq5JlCO3PxHF+Ai1ybB4gY4J9MAnVqDtvtI6/Q86VNxzC89mMkONVhoujDH/z9GMoqJQMg8Crs0hTp6TMCCxQmBHZPWnWS6dk13o4an97q6fp9z9unHOeOi7I2FxK/296HTPYjna+RpCNc0SNCnGNI8TEPjfm7Od5DOexpiXIpxIVLZ3fhSSxSNj4NIlGrjjIoYdBgRmAjIDE1mN4/wtUkyCFPJNnZw5Pj96wI1DiTBPbQkcY4ccWu5Uq24sWN6q4TRpxZNDu+4TdCF/ByUSBstnZn+uahB5iRoEtfIJXB2+0Z8PLFtWj6qYe2ci7i9JzwAbmCeMj/bAgx6pOrLNH4hIIXWzNHclPmXZPrcHc6D/bgDs7QMRMd21bq9y/wjP6fCVioX/10ZPTTbHs5lF5ZvpTDEd64+RowIMOJwcvndulsYv+PKVTCC5szagkOGBeSQ0hPiwc91Pazljfej5TMnfLkCYWuqjFn4oNuS8eJqjL2Az89NbILb06AXzMpX4mENUcHcGoW2d+lxrZ/QAdrRL/y3ighPXnlBNfz3U0C0a/rVEg/U/pRTIunCzdM33xL+0kmq+gJIPAl1J3TCXW51+QIZorHqiT+0pA4yrVXdcaJWn7Os/26N7b/4h+0ADFJJoU/kQZlJMcjaqQouNXTzElOrlhAUo09J0K/StiHlttl8aBhmM6eU6yYTc7iUauTWpkWeZ2MzODrpT3hbsgLd8x8l9N1vUHwU/YQxS+QbfwZBsRj3rNjRThR1hwkTzek2ypsmz8SQiwlHV5pF+paWKYce5M/6gfr2VHX6ZWg3e4vks7cCZ/sPBOr3JWgooordZ3bOcgp5iHAFDnAZ+CqZUlndsFz5JAOLBswA2NWKd4Z70TnrHPlsxENePvtSc9XWDLxcxi8fLCv9N81xdBJW1NKlFhKcoqvIIMxc27k3VzYjCzpDohIDHRshI361gwkoUQGDJGcJjioKswQJhPlFIIfTEAv353lF+Yv3b4U2C1fDVdaznsDYQoeaASLP+HKo2L+W05aHMDzfuswgTc65RJLzPAdHKb9X374f5oQBdvfUJFEBZkwbWNZPyvFquexQWOk5neuHygfD2k8p2Rv12P1jR6QeWiYh/DZ64PR27fCIk+b+Ifgu5slYMayH6qpK9R7zAN5mNi1Z2KCWNkaxpEwrhFv6ncHYuUOmKwxH1frpDMl3n+GjtBPQ0qEHc0ixCvMtsdEfzMKPfz9RTRPf7ia4/Dm1DIpvDl0fk/lKaMdQEEZgCFiSWPrUS9HNpHlUCj9SWRQdbq9xsP+q5hY9ri8iyyLGZsRBRbi3KE6xPM94nwUqaOenT9daoOn7LydTNRb4aVR98ROcgK4CYgdjXVTDnvs5OviFsB2yH40iGl8o3hurutzK5Bt6lfsJsbE45YYgArNrBEBdQmHXOxnOlG3ujXGxmp0ODKuKeYhwRcyhQ39IMExfBBhbDnOzI1cay5NPk8ht1NAa//6maFBD3Schn8LQjcw3Zqu2pxusawRFtvnwhu5CKqiKbr+zfD/fGquYcyeT1DN12BxRkZGRHZiWLWW2cdi4t86UhynpFMuDPf1tHAhy+YZUxCXZEO/os5bvz6THI2FclCiTUv4Q+eidIDqVQiN1Yr1vjU5CWB/aaiHG2jrgf+JGKg0GyxFyPq9t/jE3lnPY2CKlpip0T5FRsVFH+NOOOBaOXFEGf8xi0dFLGn3iJSWwASBlM8Oc5eR0IdBpMsUZt0L9Kb1QW2w/mVyY= X-Exchange-RoutingPolicyChecked: sYyjAvjlWam+yRPUg4b0GKAkprf2ay76keO5cbn7sIj+rQ25rMS1gm7Ffpj9Hm6tzxE4ec2wit7Pj+9ZQwVsqihQej/QCTxMB1p6xWbRcrSxs/alwF5LYH0Iy5ujrFRRIkSF6HSgr0fA0OD3hwYxSADE/SQXmA84CGrjrB5iseeRZaPCTKUIaSforcEIX9d6tJpHQBWi0RoIEsNjQkFRa0cyAhhgdh8y3c5Tab8WsePM17C+V3Wjmbne9GZk7C5fI3vWQ1TKNxhDCKg+PvC8PnCM3QaJb0V5sjikhWZpS/PwByytmbEwXcrda8FmACMHlp8RqjecYCUYmnUuWM1Vcg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d3d3938-42bf-493c-a1a2-08df0248df1d X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:31.5280 (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: scXHTlDm5xi1crYa7U1A2QjkKiZfUjkp2+wcSAzMCa8GxmtMQsdwPaoL8PXiQwke9LSsSncu+EEmcxKLzU5l3MibDe0pZHFTS+U+r7Y2HZ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX4o0I07r/C3w/ sVvHUvrgaZU6zAXC+J5RCRf8QpNm9WmJ7ctSfX2Zfh5Rrb0aVs+nN0nG5yR7fIvglf9jdgFSDMZ tM3wbucPGo8uIOGYQiD/cI5ApzYxWBg7hXsPS7MXvAK4TSjJClVi X-Proofpoint-ORIG-GUID: TrCg5awQHbKf_6xPkO8SyFgICbsJHg2H X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX2CtiPiSw8H8w WdxYFPXmC0TijPtJ0nuMZk9g5tZGsrkltGP9RBYHJG0gKEc6D3HRD2AbrPYBX5SwvLbTaBcFm5Q JZB3kacoP6LT0zFaknLUY6SnMSlRz42kiF65eNTewiBB6aUPhq89JEJPJ70dYbiaFYd3TavtoH5 3MyjxI1zghwBQ6Gg0Qm1SxcMB9VCSsE4mag+s87y1rndmwvh/4zGUCLMEJJv6y5LDhAEw//3FY9 cEqxelWrwN1Xz9IyB2oyUkdrSv0VkmzGioJL91Uq5zO7LGM39ici/h+n/d1t51Ech/Ug2H7aTd5 PmZWxSoE36TRQtCOz53TDWtMXL+o5hdId/7ypILG4fK8mcWEwU81AcX2idhQ+5Mqybx2gZCL+tz ZYh8qo57spsTjLWa3gGs6B2dYl8CAHoyEKZ+0/UMDLVQsmRRLJ1CiU42FkmVT9f10xzAkcY62pq ESPH1/0z4RzMws9HhYg== X-Proofpoint-GUID: 35OtUHcOkQm8rI_n1mvUNTtG8Sxz0iD4 X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8cf0ef cx=c_pps a=+CKpLqsC5QamL8vULJ+FWg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=fTW__CHxibyLmBMfj2wP:22 a=NEAV23lmAAAA:8 a=3uWsZ661AAAA:8 a=t7CeM3EgAAAA:8 a=tyuvAb6jAAAA:8 a=yC51jOswJ7eKArgWbMgA:9 a=fYNom5PXsM5enKJDCoVv:22 a=FdTzh2GWekK77mhwV6Dw:22 a=vMd6T1JfvD_20K6YSfI9:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244179 The patch is from: https://github.com/libarchive/libarchive/pull/3346/ Fixed: $ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native cannot open archive from pipe /path/to/tmp-debuginfod/work/x86-64-v3-poky-linux/xz/5.8.2/localpkgfeed/x86_64_v3/bash-locale-vi-5.3-r0.x86_64_v3.rpm libarchive error: cannot open archive from pipe: Unrecognized archive format exceptions encountered during archive scan Note: 0001-append_filter-Use-last-bidder-for-filter.patch was already present from upstream, so only the remaining two PR #3346 patches are added here. Signed-off-by: Sumanth Gavini --- ...-Verify-that-bidder-and-filter-match.patch | 103 +++++++ .../libarchive/0003-Remove-bidder-name.patch | 258 ++++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 2 + 3 files changed, 363 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Remove-bidder-name.patch diff --git a/meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch b/meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch new file mode 100644 index 0000000000..a91f518207 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch @@ -0,0 +1,103 @@ +From db4fb440792278cd01e0829c93f6b62f567b704b Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Sun, 2 Aug 2026 14:26:22 +0200 +Subject: [PATCH 1/3] append_filter: Verify that bidder and filter match + +Make sure that appending a filter always matches its supposed bidder. + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/3346] +Signed-off-by: Tobias Stoeckmann +Signed-off-by: Sumanth Gavini +--- + Makefile.am | 1 + + libarchive/test/CMakeLists.txt | 1 + + .../test/test_archive_read_append_filter.c | 54 +++++++++++++++++++ + 3 files changed, 56 insertions(+) + create mode 100644 libarchive/test/test_archive_read_append_filter.c + +diff --git a/Makefile.am b/Makefile.am +index 2fb4fdf4..c96b3bc6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -404,6 +404,7 @@ libarchive_test_SOURCES= \ + libarchive/test/test_archive_pathmatch_oob.c \ + libarchive/test/test_archive_read.c \ + libarchive/test/test_archive_read_add_passphrase.c \ ++ libarchive/test/test_archive_read_append_filter.c \ + libarchive/test/test_archive_read_close_twice.c \ + libarchive/test/test_archive_read_multiple_data_objects.c \ + libarchive/test/test_archive_read_next_header_empty.c \ +diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt +index 44f839f8..c4102c3d 100644 +--- a/libarchive/test/CMakeLists.txt ++++ b/libarchive/test/CMakeLists.txt +@@ -33,6 +33,7 @@ IF(ENABLE_TEST) + test_archive_pathmatch_oob.c + test_archive_read.c + test_archive_read_add_passphrase.c ++ test_archive_read_append_filter.c + test_archive_read_close_twice.c + test_archive_read_multiple_data_objects.c + test_archive_read_next_header_empty.c +diff --git a/libarchive/test/test_archive_read_append_filter.c b/libarchive/test/test_archive_read_append_filter.c +new file mode 100644 +index 00000000..5c301d52 +--- /dev/null ++++ b/libarchive/test/test_archive_read_append_filter.c +@@ -0,0 +1,54 @@ ++/*- ++ * Copyright (c) 2026 Tobias Stoeckmann ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include "archive.h" ++#include "test.h" ++ ++DEFINE_TEST(test_archive_read_append_filter) ++{ ++ struct archive *a; ++ int r; ++ ++ a = archive_read_new(); ++ assert(a != NULL); ++ ++ /* Append a program bidder (without filter). */ ++ assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_support_filter_program(a, "prog1")); ++ ++ /* Append a filter program which comes with its own bidder. */ ++ r = archive_read_append_filter_program(a, "prog2"); ++ ++ /* Verify that filter uses its own bidder. */ ++ if (r == ARCHIVE_FATAL) { ++ assertEqualStringA(a, "Can't initialize filter; unable to run program \"prog2\"", ++ archive_error_string(a)); ++ } else { ++ assertEqualIntA(a, ARCHIVE_OK, r); ++ assertEqualStringA(a, "Program: prog2", archive_filter_name(a, 0)); ++ } ++ ++ archive_read_free(a); ++} +-- +2.49.0 diff --git a/meta/recipes-extended/libarchive/libarchive/0003-Remove-bidder-name.patch b/meta/recipes-extended/libarchive/libarchive/0003-Remove-bidder-name.patch new file mode 100644 index 0000000000..bbd2478577 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0003-Remove-bidder-name.patch @@ -0,0 +1,258 @@ +From 76c7142bd2595184826722063598fddf62031cca Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Sun, 2 Aug 2026 14:31:33 +0200 +Subject: [PATCH 3/3] Remove bidder name + +The name was only needed to find the appropriate bidder for a filter. +Since this has been resolved by accessing the last bidder, since in these +situations the bidder is added first, then the filter, the name is not +needed anymore. + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/3346] +Signed-off-by: Tobias Stoeckmann +Signed-off-by: Sumanth Gavini +--- + libarchive/archive_read.c | 2 -- + libarchive/archive_read_append_filter.c | 1 - + libarchive/archive_read_private.h | 3 --- + libarchive/archive_read_support_filter_bzip2.c | 2 +- + libarchive/archive_read_support_filter_compress.c | 2 +- + libarchive/archive_read_support_filter_grzip.c | 2 +- + libarchive/archive_read_support_filter_gzip.c | 2 +- + libarchive/archive_read_support_filter_lrzip.c | 2 +- + libarchive/archive_read_support_filter_lz4.c | 2 +- + libarchive/archive_read_support_filter_lzop.c | 2 +- + libarchive/archive_read_support_filter_program.c | 2 +- + libarchive/archive_read_support_filter_rpm.c | 2 +- + libarchive/archive_read_support_filter_uu.c | 2 +- + libarchive/archive_read_support_filter_xz.c | 6 +++--- + libarchive/archive_read_support_filter_zstd.c | 2 +- + 15 files changed, 14 insertions(+), 20 deletions(-) + +diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c +index e844e42d..406d84de 100644 +--- a/libarchive/archive_read.c ++++ b/libarchive/archive_read.c +@@ -1290,7 +1290,6 @@ __archive_read_register_format(struct archive_read *a, + int + __archive_read_register_bidder(struct archive_read *a, + void *bidder_data, +- const char *name, + const struct archive_read_filter_bidder_vtable *vtable) + { + struct archive_read_filter_bidder *bidder; +@@ -1307,7 +1306,6 @@ __archive_read_register_bidder(struct archive_read *a, + memset(a->bidders + i, 0, sizeof(a->bidders[0])); + bidder = (a->bidders + i); + bidder->data = bidder_data; +- bidder->name = name; + bidder->vtable = vtable; + if (bidder->vtable->bid == NULL || bidder->vtable->init == NULL) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER, +diff --git a/libarchive/archive_read_append_filter.c b/libarchive/archive_read_append_filter.c +index 9dd9f536..5cc8ff55 100644 +--- a/libarchive/archive_read_append_filter.c ++++ b/libarchive/archive_read_append_filter.c +@@ -174,7 +174,6 @@ archive_read_append_filter_program_signature(struct archive *_a, + __archive_read_free_filters(a); + return (ARCHIVE_FATAL); + } +- b->name = a->filter->name; + + a->bypass_filter_bidding = 1; + return r; +diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h +index 3bd8de2d..e30b6c2b 100644 +--- a/libarchive/archive_read_private.h ++++ b/libarchive/archive_read_private.h +@@ -68,8 +68,6 @@ struct archive_read_filter_bidder_vtable { + struct archive_read_filter_bidder { + /* Configuration data for the bidder. */ + void *data; +- /* Name of the filter */ +- const char *name; + const struct archive_read_filter_bidder_vtable *vtable; + }; + +@@ -250,7 +248,6 @@ int __archive_read_register_format(struct archive_read *a, + + int __archive_read_register_bidder(struct archive_read *a, + void *bidder_data, +- const char *name, + const struct archive_read_filter_bidder_vtable *vtable); + + const void *__archive_read_ahead(struct archive_read *, size_t, ssize_t *); +diff --git a/libarchive/archive_read_support_filter_bzip2.c b/libarchive/archive_read_support_filter_bzip2.c +index 588953f2..1cfc55dc 100644 +--- a/libarchive/archive_read_support_filter_bzip2.c ++++ b/libarchive/archive_read_support_filter_bzip2.c +@@ -91,7 +91,7 @@ archive_read_support_filter_bzip2(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "bzip2", ++ if (__archive_read_register_bidder(a, NULL, + &bzip2_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +diff --git a/libarchive/archive_read_support_filter_compress.c b/libarchive/archive_read_support_filter_compress.c +index 4e1f1dc5..4763995e 100644 +--- a/libarchive/archive_read_support_filter_compress.c ++++ b/libarchive/archive_read_support_filter_compress.c +@@ -160,7 +160,7 @@ archive_read_support_filter_compress(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- return __archive_read_register_bidder(a, NULL, "compress (.Z)", ++ return __archive_read_register_bidder(a, NULL, + &compress_bidder_vtable); + } + +diff --git a/libarchive/archive_read_support_filter_grzip.c b/libarchive/archive_read_support_filter_grzip.c +index 9d9ad46e..8457ec7c 100644 +--- a/libarchive/archive_read_support_filter_grzip.c ++++ b/libarchive/archive_read_support_filter_grzip.c +@@ -62,7 +62,7 @@ archive_read_support_filter_grzip(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "grzip", ++ if (__archive_read_register_bidder(a, NULL, + &grzip_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +diff --git a/libarchive/archive_read_support_filter_gzip.c b/libarchive/archive_read_support_filter_gzip.c +index 89ae0f37..34b174b7 100644 +--- a/libarchive/archive_read_support_filter_gzip.c ++++ b/libarchive/archive_read_support_filter_gzip.c +@@ -96,7 +96,7 @@ archive_read_support_filter_gzip(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "gzip", ++ if (__archive_read_register_bidder(a, NULL, + &gzip_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +diff --git a/libarchive/archive_read_support_filter_lrzip.c b/libarchive/archive_read_support_filter_lrzip.c +index 33910fe1..a1d45d77 100644 +--- a/libarchive/archive_read_support_filter_lrzip.c ++++ b/libarchive/archive_read_support_filter_lrzip.c +@@ -61,7 +61,7 @@ archive_read_support_filter_lrzip(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "lrzip", ++ if (__archive_read_register_bidder(a, NULL, + &lrzip_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +diff --git a/libarchive/archive_read_support_filter_lz4.c b/libarchive/archive_read_support_filter_lz4.c +index 19086a1f..28189a07 100644 +--- a/libarchive/archive_read_support_filter_lz4.c ++++ b/libarchive/archive_read_support_filter_lz4.c +@@ -118,7 +118,7 @@ archive_read_support_filter_lz4(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "lz4", ++ if (__archive_read_register_bidder(a, NULL, + &lz4_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +diff --git a/libarchive/archive_read_support_filter_lzop.c b/libarchive/archive_read_support_filter_lzop.c +index ebfaf01e..5a552fce 100644 +--- a/libarchive/archive_read_support_filter_lzop.c ++++ b/libarchive/archive_read_support_filter_lzop.c +@@ -109,7 +109,7 @@ archive_read_support_filter_lzop(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "lzop", ++ if (__archive_read_register_bidder(a, NULL, + &lzop_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c +index cf7c3613..a9e02a32 100644 +--- a/libarchive/archive_read_support_filter_program.c ++++ b/libarchive/archive_read_support_filter_program.c +@@ -156,7 +156,7 @@ archive_read_support_filter_program_signature(struct archive *_a, + memcpy(state->signature, signature, signature_len); + } + +- if (__archive_read_register_bidder(a, state, NULL, ++ if (__archive_read_register_bidder(a, state, + &program_bidder_vtable) != ARCHIVE_OK) { + free_state(state); + return (ARCHIVE_FATAL); +diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c +index 01bd1bf7..1cfddf75 100644 +--- a/libarchive/archive_read_support_filter_rpm.c ++++ b/libarchive/archive_read_support_filter_rpm.c +@@ -71,7 +71,7 @@ archive_read_support_filter_rpm(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- return __archive_read_register_bidder(a, NULL, "rpm", ++ return __archive_read_register_bidder(a, NULL, + &rpm_bidder_vtable); + } + +diff --git a/libarchive/archive_read_support_filter_uu.c b/libarchive/archive_read_support_filter_uu.c +index c0f6f48e..10d49648 100644 +--- a/libarchive/archive_read_support_filter_uu.c ++++ b/libarchive/archive_read_support_filter_uu.c +@@ -92,7 +92,7 @@ archive_read_support_filter_uu(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- return __archive_read_register_bidder(a, NULL, "uu", ++ return __archive_read_register_bidder(a, NULL, + &uudecode_bidder_vtable); + } + +diff --git a/libarchive/archive_read_support_filter_xz.c b/libarchive/archive_read_support_filter_xz.c +index 7c8e0cb5..b00ba543 100644 +--- a/libarchive/archive_read_support_filter_xz.c ++++ b/libarchive/archive_read_support_filter_xz.c +@@ -115,7 +115,7 @@ archive_read_support_filter_xz(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "xz", ++ if (__archive_read_register_bidder(a, NULL, + &xz_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +@@ -147,7 +147,7 @@ archive_read_support_filter_lzma(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "lzma", ++ if (__archive_read_register_bidder(a, NULL, + &lzma_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +@@ -180,7 +180,7 @@ archive_read_support_filter_lzip(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "lzip", ++ if (__archive_read_register_bidder(a, NULL, + &lzip_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + +diff --git a/libarchive/archive_read_support_filter_zstd.c b/libarchive/archive_read_support_filter_zstd.c +index 12eac04c..163f54b5 100644 +--- a/libarchive/archive_read_support_filter_zstd.c ++++ b/libarchive/archive_read_support_filter_zstd.c +@@ -87,7 +87,7 @@ archive_read_support_filter_zstd(struct archive *_a) + { + struct archive_read *a = (struct archive_read *)_a; + +- if (__archive_read_register_bidder(a, NULL, "zstd", ++ if (__archive_read_register_bidder(a, NULL, + &zstd_bidder_vtable) != ARCHIVE_OK) + return (ARCHIVE_FATAL); + diff --git a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb index 868086e319..01a5249a88 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb @@ -33,6 +33,8 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://run-ptest \ file://0001-append_filter-Use-last-bidder-for-filter.patch \ file://0001-test-skip-ppmd8-aes256-streaming-test-when-no-crypto.patch \ + file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ + file://0003-Remove-bidder-name.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/" From patchwork Tue Aug 25 01:33:06 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96231 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 72BAAC61DC3 for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12590.1787621617455446861 for ; Mon, 24 Aug 2026 18:33:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=P/2sxJhl; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P1FfU84038832 for ; Tue, 25 Aug 2026 01:33:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=35Qxh84yHI+1o9HDeg824GHThz4SBZwBX8hBqd49wyc=; b= P/2sxJhl/qDrW94CRisZbN/u17M07756Ck3hsEXR01a7QRuleK5byGBM76CJ6HdL muzQ78yGFDdwCG05IcqOoe9X5J4EyGeRDgQXdEKaEkzb+XlfVfJNxweRznM4IQO1 oQ+codqXv1zsO48MXZjy4JgULJHLoTb8UAa8BfQgyGYEYbEb0vjisiB/rrVW7g8M K8pK6ETJ5UWAKiS4yXwhhf4aWc1HR4TOH0nVKTMkIJ52rU/6Gzk99xd1KB7L9i6s YXZTFs/wa3eclHlz6otLkU7WLz1ACPSw3weKZomqbtzQ983sQpD09htK9Pm+5p3a RZZz+y9jayCJPIuIpI1nVA== Received: from sj2pr03cu001.outbound.protection.outlook.com (mail-westusazon11022093.outbound.protection.outlook.com [52.101.43.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6uqvw-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 25 Aug 2026 01:33:35 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k5Kkd2xx1hDZyl7G9BX2QDHbZofC34iHW9YGSLyW6lq1/itYbBkcXt2AJqDcPRUANhNONP9YcJGG1K95DHp5cQsnn3ijbcfDXD3a4U35yGveUVbSDYG0kAH50Qo7PGwyG9lB3r9i5Uw6nKWCIMYno/X67H/YTVr9Vb5jjEs0T8HQ6pa6w6QOV9hoT+CjEf9P1eDti8pavFmoEfYb+q8rxeCt5677WD4iruAF/pEBFA2BL+6tgKamSnFZHKO+YDXiT0fdYjpKguZpT/Ze5xvA9TAbsH5nX7qICLcs2plxXboPItqv4ROAkmUCV/o/Dq+QOisjIfXIkpvQW+ItJQVw5A== 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=35Qxh84yHI+1o9HDeg824GHThz4SBZwBX8hBqd49wyc=; b=uMixA3jtJlbB4j44qWtBzIrh6oaTf0SIZHm6DSC2Jlo6C+vV6Qi/DV1WagH/FU1CNIodmrFVmTlulMnQUdyaQPkEh5VPKu3DXxrYlrqn3kvvS7r2CI8kdTIjB9El32V3/j/3RWTK1y/ZQNn6zxzpraPKUz7iE/c0RjSERN/qruPPd7cIYYyFI9RhHy0Aj/+CaVGaDAyOc5rW0uUH0d3/ui7Ic6JXS7ITm0U7fpFCzOxBOxDZQK7JFubf8DMOa40jdtr3rm5r3yJ8NnaDVllqrOvvpxbo/vS6BGV8mTmFv5bS6U3qJjWztoWXj3b8B79oI7G+sGW/KI69njLog5ooqQ== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:33 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:33 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 08/14] rpm: Fix pkgconfig() Provides missing in cross-built RPMs Date: Mon, 24 Aug 2026 18:33:06 -0700 Message-ID: <20260825013312.2695028-9-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: a7e7ccb9-f697-479b-8a3d-08df0248dfb4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|22082099003|18002099003|11063799006|56012099006|5023799004|3023799007|38350700014|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: ZnJ9ApNedJOyReWu4FYaKTVdt99u5kuumQxYAHZ76MUP6qRnE/91BLajWZtZSHDZvdg5qU+o1EA224F1jeR4JGAVaAqYkdPxTksvtZSzl+1pPoBrz9v4YgdYuC47RLAkyo05wGyes6IUSha18nBQOMGha8WnjJs4ayxc82+/S+IHbf9sd3ZDpUQ/mLiLgQAyEp36HOrTQcxrm8+UvTrq7jhcC7aM15H0UJVLv+ass1EI9fXPzfS0KSE1tosrjDIbu5Wuo9yZCajwumUix4jgSmd1H/Ndcr+ByriWTkeYFusyQaJ+fbdXl9VOpMFzQwi1u2uA0BsnH/uNu2xW9tkDlXFkfXeoLX9orfdL1GiRIAGtC8dEBZbXl2YxwxZ6fXcbWgDBKMgS2zx5tpungVx+YcNlthS8qAhoP7OHlYkxQrReLAza9PtOL91cB+uuqt0cx6GiAunlCHqbTJqn1F6G9MxSliilxJO/qovDZ8Q/J+AbbEJGYOyE/uKDa9LPN2CC7taKHGQiz9bOnuk7OfO+vN0vvqYRkxxPLTdMM2For996WTrpu+ymxtE25n8jiC64NeYRpz7qaQFIKvGPhNHVb1rk+XxQ+u3hVU9m6zip9AmoiEBsr7IJiV2LR1UrnIRidY7UVKTstK06yzJqWn4XATnxQrdECsfaSKYsQ5AEjAP/eSVcaahOcaTSz1aqxFr5xgltGrzFuCGU2p5zv8GESe9cFlY5y7b1psHhH+sl16s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(22082099003)(18002099003)(11063799006)(56012099006)(5023799004)(3023799007)(38350700014)(6133799003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZOH4rAvJQglcMLV9i6sFPdwpsHAxcjWxWPmg0QzlOCSX7oHsdkAIuPZDC8u1ET40t+fgc6DtytufrKy3JgzUOxr8SuH/9AFsr877tC0qkL4IyRXbn82DLjqA3L4sA1yPsa4qpxNYlzNKCpT03i6MAwv9a74osfIdX+GwaBQAMTYcW9wMJpq6mSwSYgbReChazg0H/fSJGVq47DW/nH5D4qeKNmyVvyBZl+yb1IkL8a9UhzsrG2A45ij0OcG1jXApCPGY4UIlmRZS/IcytUIlEMV3rIWLpYIXbQPfDLfbqvq7CpV1YpZ/sa5ZKR41bMwJ/o8FNtA39NX2ceflC5pf4MPzqXDBbTteoaQDatD3O58JfSpQe5UJ6zLnR79QZt3RmM1LVLFkiLW8uHF1qcUc6EltUrroRnHJe6AjEa4D5Bo8GzYK6uhRpxQJians9+sgL7XbtqBGRKRSCQkrh3hzZJLDfoKTRZd4JDObe3n711N6aHo3ZT4k3+zx/TwoOkkSYFHqyT0gA2WiQg1jCV4zVRpZK0BuWWCMduxw2lQmlIwnpt8W8dVTfk7mSsJDDWPsY0PtRXj7GM1RrS9MkQZFHoxGqazvFDXbFAhtgtIFCmIUrwBK2+7FwrhQHDZgkvOeoWUYNtQ/kehwFg07Xu7YEHqaINnCtFNKKMHeI0Wo6F2SyGZQjNrhDgMoth2wksPxs1VGBvTZUnT0I2WYcBd6pRuZhSgkCRvGWnvQGy1OpgxNqUS1PT3j2dMrTLD/KRbn3SwXFPpTcXgAHIfmKiCSU9YRhG3IwkWR+bS9c02T6l2ICnw+85SrPtbT4T1xUN7JROu9iye8H+0X7EJYdapDhECO0ytsnJ7wXCLKap6SXt2inPH4pL9BuBLwJbSE1ez5R2fxByH5GHKAh8lHo8tFeZ5Gh3JFMC0rG1lLAKME+cWCJwPpuwWFKsaVngeXV7i2Y+C3zhwhV/O7LVBfDd6NrrwttJSsmazBF7BdgBMki+3Hhw9QOgl7HXphhMBBWXFcEd9fOZY0oTaclXB7fnNe5xP86APzAB2Qaq1SyBtBVf6oYxZ8nOG/n5R+jVv7YLjfqIkmXzwsAKt1iwapVsEAKOLP6SlbvQYLRqZ0RznR7qhv9Ft62+F2QEaAnrB67N7o7LumxXHhulLaj6RoJt2+l6uo9z1NkqKFvQyeodLUkFI7q/0Ts3U9zSHNAjlfkA1qD5xRTkiivP2D/oeLnzGxLy9YfPv4IU7o/gfSggWdjbkJ7RjaJi3CdgoREtuISFwj5EXFVNNX+Mf7OG9fs9cbFzZ4HDBJnJ+8Rxmd5rQDXYkhjZsS2Aj4gpSccojikXzVd7fWwdcPOA4ElWsXYNxo0iNPgv6TRDlibA/sRBkitNdtgYmdg34SAhpdnpJP04t7HGu41RwUfKM8CP4dMHOhVjgN54WdmWz2yFxUyQhdtTqcE8hVCWGKb2awv51HgRekfhaOvsNJ54zgbLStbXtB9uPIUAeYPN4BzRt1MyGL1CRQuKDFdE8dcVsXlFbb+19oV0uv/II3yjFk10gjjmtOIG5fGsV6SQYERUh6eLNvAmsbsP/4iU2W9leG5jL4rWeoj4AyHKzbU5wNO4hUxiAPUzD/FpDxvJLE2ktnrg9mU/bqiIcmYCESiXZYHQFOD6A6VyBfab5rv+TdymzqonVfSiyp3dJm8CzrOe7zSxIcOYILSEm7gpJ6eC/hM6uzyA5q6Kb8b6bg5GFue6DpQJz0ORnw9IzUn4Ye3Ej1dzJg6X8= X-Exchange-RoutingPolicyChecked: IDrSF7QdU2LW5DfX5BuTtjiMnAfYlv0sF0/7NSpnHTw1gJewbAyjkIMImv3DQatcw+vbI1PczgK35a3FXFpJY36Psk9NahWUwHCSSZg1Y8gpZYsUA/uvSOy0DI+hYyDrRWSYbS5xfMS6eVGxxHseie8yHUH4Bh149WSJvOggGHBndswcTWj6Nb9QA3yUgCS+MN36tx3/06/l/5REcf4I9OxrKMvyCUxmRvneYTCnSUsINJwfVK5F8inaBkuEF1YdlJ1CZFqowqYOT1kPAQe8Ytr3rtXf2ZP7OkPmPRTBbMtiv3pSXWUZah5xF9jDX3Maad/l1cF4TS9wsSHsP98oAA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7e7ccb9-f697-479b-8a3d-08df0248dfb4 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:32.5883 (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: afXDDq6sRJ9vwHR3QHytaWgiiFZvd67K6pNoDqA3FBnG+0WBJUsFiJ0m22ZorlxvCsbd8k7FSQD/g00NHjL2L5mxRQg8cUA14k2a06DubHQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfXybTaSJRW5CMZ M6tUuiaR1LFjqEtToAOmFLpbVuDq0UsGNon9VUgajepDecwgRUwKd6rfNQ2XVhgNduZIM7DAQ6l cfNFDL00n9ysmT5MYDYgK/9K3xReVzwdWua0gCHl+PoqJ+hLczLf X-Proofpoint-ORIG-GUID: FwOtxEVvpTudNgeibPI6D0LH7l2DUHi3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX2e9+8ArBj6lU eVSEXShsSefaAfQXNvCsEuZ8xsejGNcMtobH05XyI6Af17qDdIj9aIH4EwDOV018Z/BIuNNht5k YJq5YSmZWUxv5DD1cewfR4Cn6YCiwsc8+EwgBNRlCjTRqWlpXGHDPENKrQ4nvPcEQvuL4XGWpCk TSLjUAMeeb6VWLi0wskzIzS6rujr0qf0BKtmoM8D0rJp3ZUUbKBFCRUyDl7FfUf8uiKWzTivdvB MWYfFAUfRtrteJbPUjD/RWi0FDeg1prEiN2741EnurNhjwXi9UxzhDQ6XZYJ6nkgir5QpNMyXtb z6eY5WHQPn0FNzGDj0J9etgFuCPCypjktZcZk4aCZfPxsvBeYgzsKdQJFMBwSa2UfOwQNJbyPFO bOoCQt3A/SbynQ/um1FaHn6PISQYnn0A7+SVvYphPk8fIPxVT8lvKVRaYN0IVCGseYJAk5Tk7Zm ZDZoybHtJYUv/7UeckQ== X-Proofpoint-GUID: D0IvvaEf9ffdOO_dPluIa65MeobRavtR X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8cf0f0 cx=c_pps a=+CKpLqsC5QamL8vULJ+FWg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=fTW__CHxibyLmBMfj2wP:22 a=t7CeM3EgAAAA:8 a=NEAV23lmAAAA:8 a=ojM18H5VpAenaKTG1r8A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244180 * Added 0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch - rpm 6's internal dependency generator runs pkgconfigdeps.sh during rpmbuild, but OE's cross-build environment exports PKG_CONFIG_SYSROOT_DIR which causes pkg-config --print-provides to silently fail on .pc files in the package buildroot. Unset cross-compilation PKG_CONFIG_* variables in pkgconfigdeps.sh so that pkgconfig() Provides/Requires are correctly generated. Without this fix, do_rootfs fails with errors like: nothing provides pkgconfig(ogg) needed by flac-dev Signed-off-by: Sumanth Gavini --- ...Unset-cross-compilation-PKG_CONFIG-v.patch | 71 +++++++++++++++++++ meta/recipes-devtools/rpm/rpm_6.0.2.bb | 1 + 2 files changed, 72 insertions(+) create mode 100644 meta/recipes-devtools/rpm/files/0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch diff --git a/meta/recipes-devtools/rpm/files/0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch b/meta/recipes-devtools/rpm/files/0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch new file mode 100644 index 0000000000..eccf708872 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch @@ -0,0 +1,71 @@ +From a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0 Mon Sep 17 00:00:00 2001 +From: Sumanth Gavini +Date: Tue, 04 Aug 2026 23:30:00 -0700 +Subject: [PATCH] pkgconfigdeps.sh: Unset cross-compilation PKG_CONFIG variables + +In OpenEmbedded/Yocto cross-compilation environments, several +PKG_CONFIG_* environment variables are set to point pkg-config at the +target sysroot for recipe builds: + + PKG_CONFIG_SYSROOT_DIR=".../recipe-sysroot" + PKG_CONFIG_LIBDIR=".../recipe-sysroot/usr/lib/pkgconfig:..." + PKG_CONFIG_SYSTEM_INCLUDE_PATH=".../recipe-sysroot/usr/include" + PKG_CONFIG_SYSTEM_LIBRARY_PATH=".../recipe-sysroot/lib:..." + +These variables persist into the do_package_write_rpm task environment. +When rpmbuild's internal dependency generator invokes pkgconfigdeps.sh, +the script calls pkg-config --print-provides and --print-requires on .pc +files located in the package buildroot directory (e.g., +.../package/usr/lib/pkgconfig/ogg.pc). + +With PKG_CONFIG_SYSROOT_DIR set, pkg-config fails silently (exit 1, no +output) when querying these .pc files because it attempts to validate +paths with the sysroot prefix prepended, which doesn't match the +buildroot location. This causes all pkgconfig(...) Provides and Requires +to be missing from the generated RPMs. + +The result is do_rootfs failures like: + nothing provides pkgconfig(ogg) needed by flac-dev + nothing provides pkgconfig(libxml-2.0) needed by libcomps-dev + nothing provides pkgconfig(ncurses) needed by libreadline-dev + +Fix this by unsetting the cross-compilation PKG_CONFIG variables at the +top of pkgconfigdeps.sh. The script already sets PKG_CONFIG_PATH +explicitly to the directory containing the .pc file being scanned, so +these external variables are not needed and only cause interference. + +This was not an issue with rpm 4.x because OE-core disabled the +internal dependency generator entirely via: + --define '_use_internal_dependency_generator 0' + --define '__find_provides %{nil}' + --define '__find_requires %{nil}' + +rpm 6 no longer supports disabling the internal dependency generator +for v6 format packages, making pkgconfigdeps.sh active for the first +time in the OE cross-build environment. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Sumanth Gavini +--- + scripts/pkgconfigdeps.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/scripts/pkgconfigdeps.sh b/scripts/pkgconfigdeps.sh +index 1cab58169..f9a3b7c21 100755 +--- a/scripts/pkgconfigdeps.sh ++++ b/scripts/pkgconfigdeps.sh +@@ -1,5 +1,14 @@ + #!/bin/bash + ++# Clear cross-compilation PKG_CONFIG variables that interfere with querying ++# .pc files directly from the package buildroot. In cross-build environments ++# (e.g., OpenEmbedded/Yocto), these variables point at the target sysroot and ++# cause pkg-config to fail when processing buildroot-relative .pc files. ++unset PKG_CONFIG_SYSROOT_DIR ++unset PKG_CONFIG_LIBDIR ++unset PKG_CONFIG_SYSTEM_INCLUDE_PATH ++unset PKG_CONFIG_SYSTEM_LIBRARY_PATH ++ + pkgconfig=/usr/bin/pkg-config + test -x $pkgconfig || { + cat > /dev/null diff --git a/meta/recipes-devtools/rpm/rpm_6.0.2.bb b/meta/recipes-devtools/rpm/rpm_6.0.2.bb index e8977aa31a..c0255941ea 100644 --- a/meta/recipes-devtools/rpm/rpm_6.0.2.bb +++ b/meta/recipes-devtools/rpm/rpm_6.0.2.bb @@ -39,6 +39,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-6.0.x;protoco file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ file://0001-tools-elfdeps.cc-Remove-format-module.patch \ file://0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch \ + file://0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch \ " PE = "1" From patchwork Tue Aug 25 01:33:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96227 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 16270C61CE3 for ; Tue, 25 Aug 2026 01:33:42 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12512.1787621618107747633 for ; Mon, 24 Aug 2026 18:33:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=h1J2Tgwl; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P1ArBu4031005 for ; Tue, 25 Aug 2026 01:33:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=/hL9ZgrwrmNI/Gw8MgEdfDqfAVKTZQxOnkwWcU7u0pY=; b= h1J2Tgwl9hjNzCUxGF6YO/7NCKUXcVRJUR8MqqkevWlPLxltX3ca5pNldl8SlwA1 nmTjnAh/5waNJ8/R4s190fIqNQYfY7ozvX1bmn7t3wWltXUZxSgUUp8l1AtyECMx j5OresK3DLnWicmZ5A7OPzige9xUjObyJqTWl9t5Ad9aggLC8Bk1EQVnIBALJJsN Uonu2QkIV2+RcDtqsf8EUFDC79mjUidodxv2m7e/uAoyxnp2NuBoEeC8oFpQXPPX P4Xka6e4iKBxKQLAmaIwNBJLNTWG/2sgJolA6x4n2m1HuMWqxjolqERcLcsIX8qr eNPDQCpcrsXLWb0HiHBN0w== Received: from sj2pr03cu001.outbound.protection.outlook.com (mail-westusazon11022093.outbound.protection.outlook.com [52.101.43.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6uqvw-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 25 Aug 2026 01:33:36 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FMqvSuSt3+LNTMb4KP74K+jmv+r+1w3aNgPZrS5HfehgLCfGjrBERujRyJGmJqI/wX078lNZD7RHxGgQjPaLvq41g6LDJe8qA1fplNXJJPR8OG7pF+Ia07haqHubuC2jFnksptwkPs7nImzLWzDHTjKwKd65rpAPAlLEiz/AT5layaDDoGAKqMCcqvzohbjagEXbkKzwTa+MUzSvGgsmBLQVq1NZM2nq6PrKSMWrVVc29jPrGF6Xn6R0apjINdAZz/IwPd6QL1V/ZzJhNXMHnOQUfya2m32POpHRtc9vXDgK0Y9CthWrI38GGGP6Z2qb29Tk2omYCQseMBNoF157yw== 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=/hL9ZgrwrmNI/Gw8MgEdfDqfAVKTZQxOnkwWcU7u0pY=; b=dFAf7wercE0Y1ZhGFmO9uPl+sQBtK0iDPVJ93TYBwCv0i6pFKfDg2YksG+GBMEhErYTuxqnXofdr3nPYRJnOxrefHtaSFUEWsvWP/BsBGe1/+Nf8pMVGsrVAKwubj3dh9aVc43f6qVTxaIq8dFjypppEHOgVDIvoIoE8IXifrr3+gtNlu7B9Ie651zs41WNT77Lm1oXPjgj/Id8tdyfptvnce3/OE2Pd1EKkCpFhKCEYWJfZ3dvItHeKWfmaUm4DoIf3QUBcmPcZDK/cVPq5LluS0Z6be+qmz0kfLeeZw13Pyoww89bDK5tQRgUGZYMg3YnyJAFhvuQ3GEuuVogAUw== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:33 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:33 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 09/14] libarchive: Add RPM format reader to support rpm 6 Date: Mon, 24 Aug 2026 18:33:07 -0700 Message-ID: <20260825013312.2695028-10-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: 97a34c98-2731-48b3-2cb1-08df0248e055 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|12006099003|22082099003|25016099003|29003799003|18002099003|11063799006|56012099006|13003099007|38350700014|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: DWLfd0iTGqXuraNFUVebS/rBpMpP50FDWli/FJt3t+dIEFmu2HJ5E8hrLZiW1+w8nRfJcpcgJ6M+rs8eQB28KCRcvWq9iDqA3ua29+cfgYJmAm/Lb1WzKilV9/5eiPiMLFHam/zsEV95bm445ALuf3vNRzzcK8y4OSdZ9Ih26ZKOI2bqiXBzOL6UWDY60rmGVxec+HV8cNpM4QbeG87oWcVRvQob+nPn+dqVShRXMxBN2A3I7qzSH3d7oJRyRJ4WXWRNO17XjQBO3cmDn+GnDuBheKnvQWHJrOteE7h6y/vuKXgf442vhxaIVu8963Td/IaTTJWIsDSmLALsjC+peoJPG0QtEFwu9rujYWMQt+ZekYlUrKepiUiJpfdA1kSoul7zrMJBUinCGp97dx5MZQVh59M+TqNjsAV7CSnEWXo8zL2kgBcfU5W3Co8xglXUgDzS2yBo+85luWQoaxR7/wHWWtHVFYXGLqWcAGMWCIYJd+Ot5xiVv9NIkh6SmivmL65sI6o0IfrH+xuOyg42gwmY48xG5iaeAD7zRsvQOoqwfkEcF7TizWUYf/siQEjYA3ooVcsxkrM8TkI73MPgKD1oCyvuFwKE6ZQHIg2hILVh2eroN2ptZ5eTmkTMJPFZTV7ky+oHIqTaWpcRnmnFBiW3/E5lP7Yn3Vk7n0LPwCk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(12006099003)(22082099003)(25016099003)(29003799003)(18002099003)(11063799006)(56012099006)(13003099007)(38350700014)(6133799003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pPnMtz+dqdYO7rgs7EOEGlp2PmNUumcij4uCxTXLP3SBr2bZey8khvtfggWE17ITf0zSaAfz0XdxqzyNP9LKDmaKNuvtJj6wH2TQWG+E3oPYwu6pAJVGmx5s1ebk47rQha6oPqKYZ2P276EJ3lJH+cenQn/DV99Q/juv6OA5j6D0y4Lf5HRSn6+IpRjRbAc4BpgveruM/boXyYDKHRaV69OSCFYVHK+wdUGUElyuv7eSBtGMzPmWixIoIXvkklWJ2aaMNpyF6/4GmoXvuAo46NOSVoNfvKv9Qp5kTMMH6h/1bPrP9UWLrOX+8zCpcL3CSlafCjNLwMs8utkzGcQsPbnRN6VrlYPlc2/89mkS3dOJqcuqyXZco9D7DgolLhqiOgJD35Cqomqf4zfBtnRMBLo6H3JrTMNV6qDbnT2lhmHchvhyp5PPCpenXOiUp9s76N6WkqB1C3E2hy/DIwnDQHmcrTcN1uuEVacYqKcs1IJ8FhvoZJyYhs6mfmjUjtPwvhXKYe6UVtBEZLAxXmAwfqu/sNNN76zD3JkMrcmN0+Bh1rtgRNanwBj315rJ+E6pXersTvRWPJBMSn6Vjhz7XXiZHswacYytvyShPSzIb2U1xuk2VHDOYh+VwX/AJ/cQ12jMqp65Z1AVWFCgK/1Ewb9EGRXqQAOuEllFmftejvYnZa86n+d6IlZAZuc0B6xpRT2K7Zn6HoHR3jVrOh7A8imuZgxhjvtu2NggTB1ZVpN2yOwX1v6qeyBjWpcHSs4YC+LAZU8TZ/ZMIW25On/eL29c8xu+fNufv8Ju2MQF9BxkLPtnpUv4gQrSBPnurAIIYbOvooe04G6qWPdyLHaGm+h3jbYfvbWsZYERHON9fKKSa4gq+UXNRAs6pK0lgC6J7Jtg12IdhbzPEaAfCnU54jN9FuOC2iLjAepUmM7j7659QwRriLTUd+vPonl4eVb+sVBaKj+CpbPGgzqzXaDx3F7VyYWgbEpSCCA6JT8jc953j9ueP39YlIgJhDBwM0giYIxH0UxbU7zEKwHhnTCoOng/JHFfTVca9Ks+pfT0cvdNWHxdEE5Rgb1crwg+AkXSbLO/DRNp6mCJ4UbttpcfRbz/H/nhYzCug4SLkURGv3fewyD5mSy74m3khFJ5otYPAlLeH3bQviIYLIKgRcCwNfVOz8PDSnoCNzaa3jAaZuV/RQj6zcqpmOMFYuhVtscS+TlcVrB757UwMHbZK+dJWM0yYZ+T1+azmHZ/mYHptjZiyEjKbnDx5B9tSTveN94wbo9wjujqjKlTyJpAsSNrqnOMBRhC1PMmYXetocY89uIn9GARS4DqWuQTu9WWL1m60Hjdjpm8qq8MtMwQydQYkgk2p72wPBJ7xycq6cGXWc1iwnUpt7oYi58fHep9u0xBQFKp8NwUrFATd36wJjFwlLctrTTD/9lAmjanKq1HqnoJKJR3vX2KNkvsTev5c0T97PM1dmmvbJlOus86EjDqbbgdXFPC+3lpmo5EXyGalbW6gAKKzGQhVTSkJfosr7WItst+Tr2NxJwDd3IRKHn7+sErTZdcj+TgpbxmvvPDPq6flbYq+X2t+Z56HD7BZY3KY0UTgzPagdvq32qujxEzYRxs49Yveeqqtwmcho+ghFLfzNsA2pf8v5JLgGOFDl70TFyKIJcTdGOPfAlNTFqrqDHz8cMSEi3dfWYffTS4a9IlQ8VtEPdZiSw0Mn71MLbW+Q2veX95Vgtg59ZCUgvJI1FakrcYYZS1LLNYnpG9dcg= X-Exchange-RoutingPolicyChecked: P4xQ5HTWWfRsbx5RTPsRX2aB1X/o5KF1gaYIQyOGgTZxxTznbmjNXHWQ06anGGv0MqWkAnE5tP0tPMWT0ZPU5425k5BVIjWYiiMHqcOTXngQDpnnHtawhUfHGyw6xbbrIVu7jyzlTLyTVWVzrPQyXjC9PJwzO/TuFIebaXEv3gXl3d1l+veUAQuDdmdK+VOg0D6QAuN07EUK950sT0bHjgfib7csb4Gdu9CVsiZCamGS5pUj6mHq8Jh8DtahWADpfQFtjWHyKtELyq1L0cKMD56UE9mMnM8unffSHXvgo3Q9f2dUwubtNRtETAzRFj3O3aPYNKcVOIolcGAO8074Lw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97a34c98-2731-48b3-2cb1-08df0248e055 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:33.7169 (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: eLu0ot+7D95/sN0dMw2aGO/u1aeUYdEe2f2gzIe1RxXOUYwOwPMc6tEyrhLMrTiRt8CXyvuraDxWKOazpSuarYwJgANP8r2HKdegCX9SwfE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX1O7kY3DGrX/L aobjh/pIDFCg27679fMFwHHcyZvtMqK4hW0ft2Shr92uwjoiSSFPi460sfMBfhDKfjeZF9anP81 EgL7IymhLIRFTxnBhXvJpzDncIy7mgULUPCWDBEHfUJLsvgT78dm X-Proofpoint-ORIG-GUID: yDke-lVR3IbHvriOFmgPeWyUpxTZv1Vo X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX+fVog6tMzohB HsHjWSycPWTPojmOCVUrvVketgfmyHPI3hmNJI4Ij2zvlflVDpg954CiUKAqGfWK8AfZIEy8s7K OPCGTTnwILwHf4hUEY49nQXywDhub09mesZkj8QB6UM/2lYhCY9Rmb4iwriQ22H/h/a4Qk3daOO bpq23BLFxkpuPPbHZzQYlQFyZYlfHqmMNjpe3I/yeaCDV35f88oBN5x8uKKRK1eay5jCMUSQrN6 +1FKNerQULx4YbDEYzyqA83EQ9iwsqvEL4yUnLAUCcSJqNpkBWT0qriKdvVbyuF4cpUWX2sM/25 qN1Gf0Bn1GoYRf6aaIrp48qEoi3ru8Kvww364Qxhu+bio7dm9IBZ7+4KMRmByVX4gint2kMpjwr 8DfkqAjs99xZi9Q15Cu3XYYpIethvi01P56yALKPQzXJrUGcjOMFn6RfK6zwaXUy6hJXJ/lDVrv 6RPFXsoCihz9DY8JIzA== X-Proofpoint-GUID: ee4unYL-ewrwLEPDj-AvllrsD2n0y_Nv X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8cf0f0 cx=c_pps a=+CKpLqsC5QamL8vULJ+FWg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=fTW__CHxibyLmBMfj2wP:22 a=NEAV23lmAAAA:8 a=3uWsZ661AAAA:8 a=t7CeM3EgAAAA:8 a=xumDe5_XqNxy1WfVeCAA:9 a=fYNom5PXsM5enKJDCoVv:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244181 * Added 0004-Convert-RPM-reader-into-a-proper-format.patch to convert the RPM reader into a proper format handler. This is needed because RPM 6 changed its internal payload structure and the existing RPM filter (which only strips headers and passes payload through) can no longer parse RPM 6 packages. Without this patch, debuginfod (elfutils) cannot scan RPM 6 packages: libarchive error: cannot open archive from pipe: Unrecognized archive format The existing RPM filter is kept unchanged for API compatibility. The new format reader coexists with it - debuginfod and other tools that use archive_read_support_format_all() will use the format reader for RPM 6 packages. Fixed: $ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native $ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_qemu $ bitbake core-image-ptest-libarchive:do_testimage (libarchive_test PASS) The patch is from:[https://github.com/libarchive/libarchive/pull/2846] Signed-off-by: Sumanth Gavini --- ...vert-RPM-reader-into-a-proper-format.patch | 1400 +++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 1 + 2 files changed, 1401 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch diff --git a/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch b/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch new file mode 100644 index 0000000000..29d12bb539 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch @@ -0,0 +1,1400 @@ +From 2606336bce3a7f66cc6c8af28687a82536c9086c Mon Sep 17 00:00:00 2001 +From: Davide Beatrici +Date: Sun, 9 Aug 2026 14:14:59 -0700 +Subject: [PATCH] libarchive: Convert RPM reader into a proper format + +This adds a new RPM format reader that can handle RPM 6 packages +with their new internal structure. The existing RPM filter is kept +unchanged for API compatibility. + +Without this patch, debuginfod cannot scan RPM 6 packages: + libarchive error: cannot open archive from pipe: Unrecognized + archive format + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846] + +Signed-off-by: Sumanth Gavini +--- + Makefile.am | 1 + + contrib/android/Android.mk | 1 + + libarchive/CMakeLists.txt | 1 + + libarchive/archive.h | 6 + + libarchive/archive_read.c | 9 +- + libarchive/archive_read_private.h | 2 +- + libarchive/archive_read_set_format.c | 3 + + libarchive/archive_read_support_filter_all.c | 2 + + .../archive_read_support_filter_by_code.c | 2 + + libarchive/archive_read_support_format_all.c | 1 + + libarchive/archive_read_support_format_rpm.c | 1126 +++++++++++++++++ + libarchive/test/test_archive_read_support.c | 2 +- + .../test_read_format_cpio_svr4_bzip2_rpm.c | 4 +- + .../test_read_format_cpio_svr4_gzip_rpm.c | 4 +- + 14 files changed, 1162 insertions(+), 15 deletions(-) + create mode 100644 libarchive/archive_read_support_format_rpm.c + +diff --git a/Makefile.am b/Makefile.am +index c96b3bc..725e20c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -210,6 +210,7 @@ libarchive_la_SOURCES= \ + libarchive/archive_read_support_format_rar.c \ + libarchive/archive_read_support_format_rar5.c \ + libarchive/archive_read_support_format_raw.c \ ++ libarchive/archive_read_support_format_rpm.c \ + libarchive/archive_read_support_format_tar.c \ + libarchive/archive_read_support_format_warc.c \ + libarchive/archive_read_support_format_xar.c \ +diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk +index 9e1c72f..3d1f087 100644 +--- a/contrib/android/Android.mk ++++ b/contrib/android/Android.mk +@@ -91,6 +91,7 @@ libarchive_src_files := libarchive/archive_acl.c \ + libarchive/archive_read_support_format_rar.c \ + libarchive/archive_read_support_format_rar5.c \ + libarchive/archive_read_support_format_raw.c \ ++ libarchive/archive_read_support_format_rpm.c \ + libarchive/archive_read_support_format_tar.c \ + libarchive/archive_read_support_format_warc.c \ + libarchive/archive_read_support_format_xar.c \ +diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt +index b296637..d132123 100644 +--- a/libarchive/CMakeLists.txt ++++ b/libarchive/CMakeLists.txt +@@ -110,6 +110,7 @@ SET(libarchive_SOURCES + archive_read_support_format_rar.c + archive_read_support_format_rar5.c + archive_read_support_format_raw.c ++ archive_read_support_format_rpm.c + archive_read_support_format_tar.c + archive_read_support_format_warc.c + archive_read_support_format_xar.c +diff --git a/libarchive/archive.h b/libarchive/archive.h +index a7de6f6..89c60b3 100644 +--- a/libarchive/archive.h ++++ b/libarchive/archive.h +@@ -314,7 +314,9 @@ typedef const char *archive_passphrase_callback(struct archive *, + #define ARCHIVE_FILTER_LZMA 5 + #define ARCHIVE_FILTER_XZ 6 + #define ARCHIVE_FILTER_UU 7 ++#if ARCHIVE_VERSION_NUMBER < 4000000 + #define ARCHIVE_FILTER_RPM 8 ++#endif + #define ARCHIVE_FILTER_LZIP 9 + #define ARCHIVE_FILTER_LRZIP 10 + #define ARCHIVE_FILTER_LZOP 11 +@@ -385,6 +387,7 @@ typedef const char *archive_passphrase_callback(struct archive *, + #define ARCHIVE_FORMAT_7ZIP 0xE0000 + #define ARCHIVE_FORMAT_WARC 0xF0000 + #define ARCHIVE_FORMAT_RAR_V5 0x100000 ++#define ARCHIVE_FORMAT_RPM 0x110000 + + /* + * Codes returned by archive_read_format_capabilities(). +@@ -478,7 +481,9 @@ __LA_DECL int archive_read_support_filter_program(struct archive *, + __LA_DECL int archive_read_support_filter_program_signature + (struct archive *, const char * /* cmd */, + const void * /* match */, size_t); ++#if ARCHIVE_VERSION_NUMBER < 4000000 + __LA_DECL int archive_read_support_filter_rpm(struct archive *); ++#endif + __LA_DECL int archive_read_support_filter_uu(struct archive *); + __LA_DECL int archive_read_support_filter_xz(struct archive *); + __LA_DECL int archive_read_support_filter_zstd(struct archive *); +@@ -499,6 +504,7 @@ __LA_DECL int archive_read_support_format_mtree(struct archive *); + __LA_DECL int archive_read_support_format_rar(struct archive *); + __LA_DECL int archive_read_support_format_rar5(struct archive *); + __LA_DECL int archive_read_support_format_raw(struct archive *); ++__LA_DECL int archive_read_support_format_rpm(struct archive *); + __LA_DECL int archive_read_support_format_tar(struct archive *); + __LA_DECL int archive_read_support_format_warc(struct archive *); + __LA_DECL int archive_read_support_format_xar(struct archive *); +diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c +index 406d84d..150bd31 100644 +--- a/libarchive/archive_read.c ++++ b/libarchive/archive_read.c +@@ -1296,13 +1296,18 @@ __archive_read_register_bidder(struct archive_read *a, + int i, number_slots; + + archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC, +- ARCHIVE_STATE_NEW, "__archive_read_register_bidder"); ++ ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER, ++ "__archive_read_register_bidder"); + + number_slots = sizeof(a->bidders) / sizeof(a->bidders[0]); + + for (i = 0; i < number_slots; i++) { +- if (a->bidders[i].vtable != NULL) ++ if (a->bidders[i].vtable != NULL) { ++ if (a->bidders[i].vtable == vtable) ++ /* Already registered. */ ++ return (ARCHIVE_OK); + continue; ++ } + memset(a->bidders + i, 0, sizeof(a->bidders[0])); + bidder = (a->bidders + i); + bidder->data = bidder_data; +diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h +index e30b6c2..9ff3602 100644 +--- a/libarchive/archive_read_private.h ++++ b/libarchive/archive_read_private.h +@@ -212,7 +212,7 @@ struct archive_read { + int (*cleanup)(struct archive_read *); + int (*format_capabilties)(struct archive_read *); + int (*has_encrypted_entries)(struct archive_read *); +- } formats[16]; ++ } formats[18]; + struct archive_format_descriptor *format; /* Active format. */ + + /* +diff --git a/libarchive/archive_read_set_format.c b/libarchive/archive_read_set_format.c +index 552ab12..6a176e3 100644 +--- a/libarchive/archive_read_set_format.c ++++ b/libarchive/archive_read_set_format.c +@@ -81,6 +81,9 @@ archive_read_set_format(struct archive *_a, int code) + case ARCHIVE_FORMAT_RAW: + str = "raw"; + break; ++ case ARCHIVE_FORMAT_RPM: ++ str = "rpm"; ++ break; + case ARCHIVE_FORMAT_TAR: + str = "tar"; + break; +diff --git a/libarchive/archive_read_support_filter_all.c b/libarchive/archive_read_support_filter_all.c +index f086773..cc5c2b2 100644 +--- a/libarchive/archive_read_support_filter_all.c ++++ b/libarchive/archive_read_support_filter_all.c +@@ -60,8 +60,10 @@ archive_read_support_filter_all(struct archive *a) + archive_read_support_filter_xz(a); + /* The decode code doesn't use an outside library. */ + archive_read_support_filter_uu(a); ++#if ARCHIVE_VERSION_NUMBER < 4000000 + /* The decode code doesn't use an outside library. */ + archive_read_support_filter_rpm(a); ++#endif + /* The decode code always uses "lrzip -d -q" command-line. */ + archive_read_support_filter_lrzip(a); + /* Lzop decompress falls back to "lzop -d" command-line. */ +diff --git a/libarchive/archive_read_support_filter_by_code.c b/libarchive/archive_read_support_filter_by_code.c +index 4c8b6cb..d3c7d21 100644 +--- a/libarchive/archive_read_support_filter_by_code.c ++++ b/libarchive/archive_read_support_filter_by_code.c +@@ -49,8 +49,10 @@ archive_read_support_filter_by_code(struct archive *a, int filter_code) + return archive_read_support_filter_xz(a); + case ARCHIVE_FILTER_UU: + return archive_read_support_filter_uu(a); ++#if ARCHIVE_VERSION_NUMBER < 4000000 + case ARCHIVE_FILTER_RPM: + return archive_read_support_filter_rpm(a); ++#endif + case ARCHIVE_FILTER_LZIP: + return archive_read_support_filter_lzip(a); + case ARCHIVE_FILTER_LRZIP: +diff --git a/libarchive/archive_read_support_format_all.c b/libarchive/archive_read_support_format_all.c +index a2c5a4c..729b4c4 100644 +--- a/libarchive/archive_read_support_format_all.c ++++ b/libarchive/archive_read_support_format_all.c +@@ -58,6 +58,7 @@ archive_read_support_format_all(struct archive *a) + archive_read_support_format_empty(a); + archive_read_support_format_lha(a); + archive_read_support_format_mtree(a); ++ archive_read_support_format_rpm(a); + archive_read_support_format_tar(a); + archive_read_support_format_xar(a); + archive_read_support_format_warc(a); +diff --git a/libarchive/archive_read_support_format_rpm.c b/libarchive/archive_read_support_format_rpm.c +new file mode 100644 +index 0000000..fe0e500 +--- /dev/null ++++ b/libarchive/archive_read_support_format_rpm.c +@@ -0,0 +1,1126 @@ ++/*- ++ * Copyright (c) 2026 Davide Beatrici ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include "archive_platform.h" ++ ++#ifdef HAVE_ERRNO_H ++#include ++#endif ++ ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++#ifdef HAVE_STRING_H ++#include ++#endif ++ ++#include "archive.h" ++#include "archive_endian.h" ++#include "archive_entry.h" ++#include "archive_entry_locale.h" ++#include "archive_private.h" ++#include "archive_read_private.h" ++ ++#define MAX_NFILES 100000 ++#define STR_SIZE_LIMIT (1024 * 1024) /* 1 MiB */ ++ ++#define LEAD_MAGIC "\xed\xab\xee\xdb" ++#define HEADER_MAGIC "\x8e\xad\xe8\x01\x00\x00\x00\x00" ++ ++#define CPIO_END_MARK "TRAILER!!!" ++#define CPIO_END_MARK_SIZE 10 ++ ++#define CPIO_HEADER_STR_SIZE 16 ++#define CPIO_HEADER_SVR_SIZE 110 ++#define CPIO_HEADER_SVR_PATH_OFF 94 ++ ++#define CPIO_MAGIC_SIZE 6 ++#define CPIO_MAGIC_STR "07070X" ++#define CPIO_MAGIC_SVR4_CRC "070702" ++#define CPIO_MAGIC_SVR4_NOCRC "070701" ++ ++#define TAG_FILESIZES 1028 ++#define TAG_FILEMODES 1030 ++#define TAG_FILERDEVS 1033 ++#define TAG_FILEMTIMES 1034 ++#define TAG_FILEUSERNAMES 1039 ++#define TAG_FILEGROUPNAMES 1040 ++#define TAG_FILEDEVICES 1095 ++#define TAG_FILEINODES 1096 ++ ++#define TAG_DIRINDEXES 1116 ++#define TAG_BASENAMES 1117 ++#define TAG_DIRNAMES 1118 ++ ++#define TAG_PAYLOADCOMPRESSOR 1125 ++ ++#define TAG_LONGFILESIZES 5008 ++ ++enum rpm_cpio_format { ++ CPIO_UNKNOWN, ++ CPIO_STR, ++ CPIO_SVR4_CRC, ++ CPIO_SVR4_NOCRC ++}; ++ ++struct rpm_file_info { ++ char *pathname; ++ char *uname; ++ char *gname; ++ uint64_t size; ++ uint16_t mode; ++ int32_t dev; ++ int16_t rdev; ++ uint32_t mtime; ++ uint32_t ino; ++}; ++ ++struct rpm_inode_info { ++ uint32_t n_files; ++ struct rpm_file_info **files; ++ uint32_t n_processed; ++}; ++ ++struct rpm_inode_temp_entry { ++ uint64_t ino; ++ struct rpm_file_info **files; ++ uint32_t n_files; ++ size_t capacity; ++ struct rpm_inode_temp_entry *next; ++}; ++ ++struct rpm_lead { ++ unsigned char magic[4]; ++ unsigned char major, minor; ++ short type; ++ short archnum; ++ char name[66]; ++ short osnum; ++ short signature_type; ++ char reserved[16]; ++}; ++ ++struct rpm_header { ++ unsigned char magic[8]; ++ uint32_t n_entries; ++ uint32_t data_size; ++}; ++ ++struct rpm_entry { ++ uint32_t tag; ++ uint32_t type; ++ int32_t offset; ++ uint32_t count; ++}; ++ ++struct rpm { ++ enum { ++ ST_LEAD, ++ ST_HEADER, ++ ST_PADDING, ++ ST_ARCHIVE ++ } state; ++ uint8_t first_header; ++ ++ char *compressor; ++ ++ uint32_t n_files; ++ uint32_t n_inodes; ++ struct rpm_file_info *files; ++ struct rpm_inode_info *inodes; ++ ++ struct inode_hash_entry { ++ uint64_t ino; ++ struct rpm_inode_info *info; ++ struct inode_hash_entry *next; ++ } **inode_hash; ++ ++ size_t inode_hash_size; ++ ++ ssize_t entry_bytes_remaining; ++ ssize_t entry_bytes_unconsumed; ++ ssize_t entry_offset; ++ ssize_t entry_padding; ++}; ++ ++static int archive_read_format_rpm_bid(struct archive_read *, int); ++static int archive_read_format_rpm_read_header(struct archive_read *, ++ struct archive_entry *); ++static int archive_read_format_rpm_read_data(struct archive_read *, ++ const void **, size_t *, int64_t *); ++static int archive_read_format_rpm_read_data_skip(struct archive_read *); ++static int archive_read_format_rpm_cleanup(struct archive_read *); ++ ++static int rpm_add_entry(struct archive_read *, struct archive_entry *); ++static int rpm_parse_main_header(struct archive_read *, ++ const struct rpm_header *header); ++ ++static struct rpm_inode_info *rpm_get_inode(struct archive_read *, uint32_t); ++static enum rpm_cpio_format rpm_get_cpio_format(struct archive_read *); ++static uint8_t rpm_is_eof(struct archive_read *); ++ ++static uint16_t rpm_be16_at(const void *buf_start, ++ const void *buf_end, const size_t off); ++static uint32_t rpm_be32_at(const void *buf_start, ++ const void *buf_end, const size_t off); ++static uint64_t rpm_be64_at(const void *buf_start, ++ const void *buf_end, const size_t off); ++ ++static inline size_t rpm_limit_bytes(size_t, size_t); ++static char *rpm_strndup(struct archive_read *, const char *, size_t); ++static char *rpm_strread(struct archive_read *, size_t); ++static void rpm_strcat(struct archive_string *, const void *, const void *); ++static const char *rpm_strlist_at(const char *, const void *, ++ uint64_t, uint64_t); ++ ++static void rpm_free_inode_temp_hash(struct rpm_inode_temp_entry **, size_t); ++ ++int ++archive_read_support_format_rpm(struct archive *_a) ++{ ++ struct archive_read *a = (struct archive_read *)_a; ++ struct rpm *rpm; ++ int r; ++ ++ archive_check_magic(_a, ARCHIVE_READ_MAGIC, ++ ARCHIVE_STATE_NEW, "archive_read_support_format_rpm"); ++ ++ rpm = calloc(1, sizeof(*rpm)); ++ if (!rpm) { ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't allocate rpm data"); ++ return ARCHIVE_FATAL; ++ } ++ ++ r = __archive_read_register_format(a, ++ rpm, ++ "rpm", ++ archive_read_format_rpm_bid, ++ NULL, ++ archive_read_format_rpm_read_header, ++ archive_read_format_rpm_read_data, ++ archive_read_format_rpm_read_data_skip, ++ NULL, ++ archive_read_format_rpm_cleanup, ++ NULL, ++ NULL); ++ ++ if (r != ARCHIVE_OK) ++ free(rpm); ++ ++ return ARCHIVE_OK; ++} ++ ++static int ++archive_read_format_rpm_bid(struct archive_read *a, int best_bid) ++{ ++ const unsigned char *p; ++ ++ (void)best_bid; ++ ++ if ((p = __archive_read_ahead(a, sizeof(LEAD_MAGIC) - 1, NULL)) == NULL) ++ return -1; ++ ++ if (memcmp(p, LEAD_MAGIC, sizeof(LEAD_MAGIC) - 1) == 0) ++ return 48; ++ else ++ return ARCHIVE_WARN; ++} ++ ++static int ++archive_read_format_rpm_read_header(struct archive_read *a, ++ struct archive_entry *entry) ++{ ++ struct rpm *rpm = a->format->data; ++ const unsigned char *p; ++ int r; ++ ++ a->archive.archive_format = ARCHIVE_FORMAT_RPM; ++ ++ for (;;) { ++ switch (rpm->state) { ++ case ST_LEAD: { ++ const struct rpm_lead *lead = __archive_read_ahead(a, sizeof(*lead), NULL); ++ if (lead == NULL) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Truncated lead"); ++ return ARCHIVE_FATAL; ++ } ++ ++ if (memcmp(lead->magic, LEAD_MAGIC, sizeof(lead->magic)) != 0) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Unrecognized lead"); ++ return ARCHIVE_FATAL; ++ } ++ ++ __archive_read_consume(a, sizeof(*lead)); ++ ++ rpm->state = ST_HEADER; ++ rpm->first_header = 1; ++ break; ++ } ++ case ST_HEADER: { ++ struct rpm_header header; ++ ++ p = __archive_read_ahead(a, sizeof(header), NULL); ++ if (p == NULL) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Truncated header"); ++ return ARCHIVE_FATAL; ++ } ++ ++ memcpy(&header, p, sizeof(header)); ++ ++ if (memcmp(header.magic, HEADER_MAGIC, sizeof(header.magic)) != 0) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Unrecognized header"); ++ return ARCHIVE_FATAL; ++ } ++ ++ header.n_entries = archive_be32dec(&header.n_entries); ++ header.data_size = archive_be32dec(&header.data_size); ++ ++ __archive_read_consume(a, sizeof(header)); ++ ++ r = rpm_parse_main_header(a, &header); ++ if (r != ARCHIVE_OK) ++ return r; ++ ++ rpm->state = ST_PADDING; ++ break; ++ } ++ case ST_PADDING: { ++ for (;;) { ++ p = __archive_read_ahead(a, 1, NULL); ++ if (p == NULL) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Truncated padding"); ++ return ARCHIVE_FATAL; ++ } ++ ++ if (*p != 0) ++ break; ++ ++ __archive_read_consume(a, 1); ++ } ++ ++ if (rpm->first_header) { ++ rpm->first_header = 0; ++ rpm->state = ST_HEADER; ++ } else { ++ enum rpm_cpio_format cpio_format; ++ ++ if (!rpm->compressor) { ++ /* No compression. */ ++ } else if (strcmp(rpm->compressor, "zstd") == 0) { ++ r = archive_read_append_filter(&a->archive, ARCHIVE_FILTER_ZSTD); ++ } else if (strcmp(rpm->compressor, "xz") == 0) { ++ archive_read_append_filter(&a->archive, ARCHIVE_FILTER_XZ); ++ } else if (strcmp(rpm->compressor, "gzip") == 0) { ++ archive_read_append_filter(&a->archive, ARCHIVE_FILTER_GZIP); ++ } else if (strcmp(rpm->compressor, "bzip2") == 0) { ++ archive_read_append_filter(&a->archive, ARCHIVE_FILTER_BZIP2); ++ } else if (strcmp(rpm->compressor, "lzma") == 0) { ++ archive_read_append_filter(&a->archive, ARCHIVE_FILTER_LZMA); ++ } else { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Unrecognized compressor: %s", rpm->compressor); ++ return ARCHIVE_FATAL; ++ } ++ ++ if (r != ARCHIVE_OK) { ++ archive_set_error(&a->archive, r, "Cannot append %s filter", ++ rpm->compressor); ++ return r; ++ } ++ ++ cpio_format = rpm_get_cpio_format(a); ++ switch (cpio_format) { ++ case CPIO_STR: ++ a->archive.archive_format_name = "RPM (stripped CPIO)"; ++ break; ++ case CPIO_SVR4_CRC: ++ a->archive.archive_format_name = "RPM (SVR4 cpio with CRC)"; ++ break; ++ case CPIO_SVR4_NOCRC: ++ a->archive.archive_format_name = "RPM (SVR4 cpio with no CRC)"; ++ break; ++ case CPIO_UNKNOWN: ++ default: ++ return ARCHIVE_FATAL; ++ } ++ ++ rpm->state = ST_ARCHIVE; ++ } ++ break; ++ } ++ case ST_ARCHIVE: ++ return rpm_add_entry(a, entry); ++ } ++ } ++} ++ ++static int ++archive_read_format_rpm_read_data(struct archive_read *a, ++ const void **buff, size_t *size, int64_t *offset) ++{ ++ struct rpm *rpm = a->format->data; ++ ssize_t bytes_read; ++ ++ if (rpm->entry_bytes_unconsumed > 0) { ++ __archive_read_consume(a, rpm->entry_bytes_unconsumed); ++ rpm->entry_bytes_unconsumed = 0; ++ } ++ ++ if (rpm->entry_bytes_remaining > 0) { ++ *buff = __archive_read_ahead(a, 1, &bytes_read); ++ if (bytes_read <= 0) ++ return ARCHIVE_FATAL; ++ ++ if (bytes_read > rpm->entry_bytes_remaining) ++ bytes_read = (ssize_t)rpm->entry_bytes_remaining; ++ ++ *size = bytes_read; ++ rpm->entry_bytes_unconsumed = bytes_read; ++ *offset = rpm->entry_offset; ++ rpm->entry_offset += bytes_read; ++ rpm->entry_bytes_remaining -= bytes_read; ++ ++ return ARCHIVE_OK; ++ } else { ++ if (rpm->entry_padding != ++ __archive_read_consume(a, rpm->entry_padding)) { ++ return ARCHIVE_FATAL; ++ } ++ ++ rpm->entry_padding = 0; ++ *buff = NULL; ++ *size = 0; ++ *offset = rpm->entry_offset; ++ ++ return ARCHIVE_EOF; ++ } ++} ++ ++static int ++archive_read_format_rpm_read_data_skip(struct archive_read *a) ++{ ++ struct rpm *rpm = a->format->data; ++ const ssize_t to_skip = rpm->entry_bytes_remaining + rpm->entry_padding ++ + rpm->entry_bytes_unconsumed; ++ ++ if (to_skip != __archive_read_consume(a, to_skip)) ++ return ARCHIVE_FATAL; ++ ++ rpm->entry_bytes_remaining = 0; ++ rpm->entry_padding = 0; ++ rpm->entry_bytes_unconsumed = 0; ++ ++ return ARCHIVE_OK; ++} ++ ++static int ++archive_read_format_rpm_cleanup(struct archive_read *a) ++{ ++ struct rpm *rpm = a->format->data; ++ size_t i; ++ ++ free(rpm->compressor); ++ ++ if (rpm->inode_hash) { ++ for (i = 0; i < rpm->inode_hash_size; ++i) { ++ free(rpm->inode_hash[i]); ++ } ++ ++ free(rpm->inode_hash); ++ } ++ ++ if (rpm->inodes != NULL) { ++ for (i = 0; i < rpm->n_inodes; i++) { ++ free(rpm->inodes[i].files); ++ } ++ ++ free(rpm->inodes); ++ } ++ ++ if (rpm->files != NULL) { ++ for (i = 0; i < rpm->n_files; i++) { ++ free(rpm->files[i].pathname); ++ free(rpm->files[i].uname); ++ free(rpm->files[i].gname); ++ } ++ ++ free(rpm->files); ++ } ++ ++ free(rpm); ++ ++ a->format->data = NULL; ++ ++ return ARCHIVE_OK; ++} ++ ++static int ++rpm_add_entry(struct archive_read *a, struct archive_entry *entry) ++{ ++ struct rpm *rpm = a->format->data; ++ struct rpm_file_info *file = NULL; ++ struct rpm_inode_info *inode; ++ uint64_t idx_ino; ++ const void *p; ++ ++ const enum rpm_cpio_format cpio_format = rpm_get_cpio_format(a); ++ ++ p = __archive_read_ahead(a, CPIO_HEADER_STR_SIZE, NULL); ++ if (!p) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Premature EOF"); ++ return ARCHIVE_FATAL; ++ } ++ ++ char hex_str[9] = {0}; ++ memcpy(hex_str, p + CPIO_MAGIC_SIZE, sizeof(idx_ino)); ++ idx_ino = strtoull(hex_str, NULL, 16); ++ ++ switch (cpio_format) { ++ case CPIO_STR: ++ __archive_read_consume(a, CPIO_HEADER_STR_SIZE); ++ ++ if (rpm_is_eof(a)) ++ return ARCHIVE_EOF; ++ ++ if (idx_ino >= rpm->n_files) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "File index %" PRIu64 " out of range (max %u)", idx_ino, rpm->n_files - 1); ++ return ARCHIVE_FATAL; ++ } ++ ++ file = &rpm->files[idx_ino]; ++ inode = rpm_get_inode(a, file->ino); ++ if (!inode) ++ return ARCHIVE_FATAL; ++ ++ break; ++ case CPIO_SVR4_CRC: ++ case CPIO_SVR4_NOCRC: { ++ size_t i; ++ uint64_t size; ++ char *path; ++ ++ p = __archive_read_ahead(a, CPIO_HEADER_SVR_SIZE, NULL); ++ if (!p) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Truncated SVR4 header"); ++ return ARCHIVE_FATAL; ++ } ++ ++ memcpy(hex_str, p + CPIO_HEADER_SVR_PATH_OFF, sizeof(size)); ++ ++ __archive_read_consume(a, CPIO_HEADER_SVR_SIZE); ++ ++ if (rpm_is_eof(a)) ++ return ARCHIVE_EOF; ++ ++ inode = rpm_get_inode(a, idx_ino); ++ if (!inode) ++ return ARCHIVE_FATAL; ++ ++ size = strtoull(hex_str, NULL, 16); ++ ++ path = rpm_strread(a, size); ++ if (!path) ++ return ARCHIVE_FATAL; ++ ++ for (i = 0; i < inode->n_files; ++i) { ++ if (strcmp(inode->files[i]->pathname, path) == 0) { ++ file = inode->files[i]; ++ break; ++ } ++ } ++ ++ free(path); ++ ++ if (!file) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Path not found"); ++ return ARCHIVE_FATAL; ++ } ++ ++ /* Pad name to 2 more than a multiple of 4. */ ++ size += (2 - size) & 3; ++ __archive_read_consume(a, size); ++ ++ break; ++ } ++ default: ++ return ARCHIVE_FATAL; ++ } ++ ++ archive_entry_set_pathname_utf8(entry, file->pathname); ++ archive_entry_set_uname_utf8(entry, file->uname); ++ archive_entry_set_gname_utf8(entry, file->gname); ++ archive_entry_set_dev(entry, file->dev); ++ archive_entry_set_ino(entry, file->ino); ++ archive_entry_set_mode(entry, file->mode); ++ archive_entry_set_rdev(entry, file->rdev); ++ archive_entry_set_mtime(entry, file->mtime, 0); ++ archive_entry_set_nlink(entry, inode->n_files); ++ ++ /* Hardlink: only last entry carries payload */ ++ if (++inode->n_processed == inode->n_files) ++ rpm->entry_bytes_remaining = file->size; ++ else ++ rpm->entry_bytes_remaining = 0; ++ ++ /* Pad file contents to a multiple of 4. */ ++ rpm->entry_padding = 3 & -rpm->entry_bytes_remaining; ++ rpm->entry_offset = 0; ++ rpm->entry_bytes_unconsumed = 0; ++ ++ if (S_ISLNK(file->mode)) { ++ char *target = rpm_strread(a, file->size); ++ if (!target) ++ return ARCHIVE_FATAL; ++ ++ __archive_read_consume(a, rpm->entry_bytes_remaining); ++ rpm->entry_bytes_remaining = 0; ++ ++ archive_entry_set_symlink_utf8(entry, target); ++ ++ free(target); ++ } ++ ++ archive_entry_set_size(entry, rpm->entry_bytes_remaining); ++ ++ return ARCHIVE_OK; ++} ++ ++static int ++rpm_parse_main_header(struct archive_read *a, const struct rpm_header *header) ++{ ++ struct rpm *rpm = a->format->data; ++ ++ struct rpm_header_parse { ++ uint32_t n_files; ++ ++ const char *basenames; ++ uint32_t n_basenames; ++ ++ const char *dirnames; ++ uint32_t n_dirnames; ++ ++ const char *usernames; ++ uint32_t n_usernames; ++ ++ const char *groupnames; ++ uint32_t n_groupnames; ++ ++ union { ++ const int64_t *filesizes64; ++ const int32_t *filesizes32; ++ }; ++ uint8_t is_filesizes64; ++ ++ const int32_t *dirindexes; ++ const int16_t *filemodes; ++ const int32_t *filedevices; ++ const int16_t *filerdevs; ++ const int32_t *filemtimes; ++ const int32_t *fileinodes; ++ } hp; ++ ++ const struct rpm_entry *entries; ++ struct rpm_inode_temp_entry **temp_hash; ++ size_t hlen, temp_hash_size = 1; ++ uint64_t i, ino = 0; ++ ++ memset(&hp, 0, sizeof(hp)); ++ ++ hlen = sizeof(struct rpm_entry) ++ * (size_t)header->n_entries ++ + (size_t)header->data_size; ++ ++ entries = __archive_read_ahead(a, hlen, NULL); ++ if (entries == NULL) ++ return ARCHIVE_EOF; ++ ++ if (rpm->first_header) { ++ __archive_read_consume(a, hlen); ++ return ARCHIVE_OK; ++ } ++ ++ for (i = 0; i < header->n_entries; i++) { ++ uint32_t tag, cnt; ++ int32_t off; ++ const void *p; ++ ++ tag = archive_be32dec(&entries[i].tag); ++ off = archive_be32dec(&entries[i].offset); ++ cnt = archive_be32dec(&entries[i].count); ++ ++ if (off < 0 || (uint32_t)off >= header->data_size) ++ continue; ++ ++ p = (const uint8_t *)&entries[header->n_entries] + off; ++ ++ switch (tag) { ++ case TAG_PAYLOADCOMPRESSOR: ++ rpm->compressor = rpm_strndup(a, p ? p : "", 0); ++ break; ++ case TAG_BASENAMES: ++ hp.basenames = p; ++ hp.n_basenames = cnt; ++ break; ++ case TAG_DIRNAMES: ++ hp.dirnames = p; ++ hp.n_dirnames = cnt; ++ break; ++ case TAG_FILEUSERNAMES: ++ hp.usernames = p; ++ hp.n_usernames = cnt; ++ break; ++ case TAG_FILEGROUPNAMES: ++ hp.groupnames = p; ++ hp.n_groupnames = cnt; ++ break; ++ case TAG_LONGFILESIZES: ++ hp.filesizes64 = p; ++ hp.n_files = cnt; ++ hp.is_filesizes64 = 1; ++ break; ++ case TAG_FILESIZES: ++ /* This tag should never appear when Longfilesizes is present, ++ * but checking doesn't hurt. */ ++ if (!hp.is_filesizes64) { ++ hp.filesizes32 = p; ++ hp.n_files = cnt; ++ } ++ break; ++ case TAG_DIRINDEXES: ++ hp.dirindexes = p; ++ break; ++ case TAG_FILEINODES: ++ hp.fileinodes = p; ++ break; ++ case TAG_FILEMODES: ++ hp.filemodes = p; ++ break; ++ case TAG_FILEDEVICES: ++ hp.filedevices = p; ++ break; ++ case TAG_FILERDEVS: ++ hp.filerdevs = p; ++ break; ++ case TAG_FILEMTIMES: ++ hp.filemtimes = p; ++ break; ++ } ++ } ++ ++ if (hp.n_files >= MAX_NFILES) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "n_files out of range"); ++ return ARCHIVE_FATAL; ++ } ++ ++ rpm->files = calloc(hp.n_files, sizeof(*rpm->files)); ++ if (rpm->files == NULL) { ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't allocate files data"); ++ return ARCHIVE_FATAL; ++ } ++ ++ rpm->n_files = hp.n_files; ++ ++ while (temp_hash_size < hp.n_files * 2) ++ temp_hash_size <<= 1; ++ ++ temp_hash = calloc(temp_hash_size, sizeof(*temp_hash)); ++ if (!temp_hash) { ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't allocate temp hash"); ++ return ARCHIVE_FATAL; ++ } ++ ++ for (i = 0; i < hp.n_files; i++) { ++ const void *hbuf_end = (const uint8_t *)entries + hlen; ++ struct rpm_file_info *file = &rpm->files[i]; ++ struct rpm_inode_temp_entry *group; ++ struct archive_string as; ++ const char *dname, *bname, *uname, *gname; ++ size_t bucket; ++ ++ if (hp.dirindexes != NULL) { ++ const uint32_t diri = rpm_be32_at(hp.dirindexes, hbuf_end, i); ++ ++ if (diri >= hp.n_dirnames) { ++ rpm_free_inode_temp_hash(temp_hash, temp_hash_size); ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "dirindex out of range"); ++ return ARCHIVE_FATAL; ++ } ++ ++ dname = rpm_strlist_at(hp.dirnames, hbuf_end, diri, hp.n_dirnames); ++ } else ++ dname = NULL; ++ ++ bname = rpm_strlist_at(hp.basenames, hbuf_end, i, hp.n_basenames); ++ uname = rpm_strlist_at(hp.usernames, hbuf_end, i, hp.n_usernames); ++ gname = rpm_strlist_at(hp.groupnames, hbuf_end, i, hp.n_groupnames); ++ ++ archive_string_init(&as); ++ archive_strappend_char(&as, '.'); ++ rpm_strcat(&as, dname, hbuf_end); ++ rpm_strcat(&as, bname, hbuf_end); ++ file->pathname = strdup(as.s); ++ archive_string_free(&as); ++ ++ file->uname = rpm_strndup(a, uname ? uname : "", 0); ++ file->gname = rpm_strndup(a, gname ? gname : "", 0); ++ ++ if (hp.is_filesizes64) ++ file->size = rpm_be64_at(hp.filesizes64, hbuf_end, i); ++ else ++ file->size = rpm_be32_at(hp.filesizes32, hbuf_end, i); ++ file->mode = rpm_be16_at(hp.filemodes, hbuf_end, i); ++ file->dev = rpm_be32_at(hp.filedevices, hbuf_end, i); ++ file->rdev = rpm_be16_at(hp.filerdevs, hbuf_end, i); ++ file->mtime = rpm_be32_at(hp.filemtimes, hbuf_end, i); ++ file->ino = rpm_be32_at(hp.fileinodes, hbuf_end, i); ++ ++ bucket = file->ino & (temp_hash_size - 1); ++ group = temp_hash[bucket]; ++ ++ while (group) { ++ if (group->ino == file->ino) ++ break; ++ ++ group = group->next; ++ } ++ ++ if (!group) { ++ group = calloc(1, sizeof(*group)); ++ if (!group) { ++ rpm_free_inode_temp_hash(temp_hash, temp_hash_size); ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't allocate inode group"); ++ return ARCHIVE_FATAL; ++ } ++ ++ group->ino = file->ino; ++ group->files = NULL; ++ group->n_files = 0; ++ group->capacity = 0; ++ ++ group->next = temp_hash[bucket]; ++ temp_hash[bucket] = group; ++ } ++ ++ if (group->n_files >= group->capacity) { ++ group->capacity = group->capacity ? group->capacity * 2 : 8; ++ void *prev_ptr = group->files; ++ ++ group->files = realloc(group->files, group->capacity * sizeof(*group->files)); ++ if (!group->files) { ++ free(prev_ptr); ++ rpm_free_inode_temp_hash(temp_hash, temp_hash_size); ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't grow inode file list"); ++ return ARCHIVE_FATAL; ++ } ++ } ++ ++ group->files[group->n_files++] = file; ++ } ++ ++ rpm->n_inodes = 0; ++ for (i = 0; i < temp_hash_size; i++) { ++ for (struct rpm_inode_temp_entry *e = temp_hash[i]; e; e = e->next) ++ rpm->n_inodes++; ++ } ++ ++ rpm->inodes = calloc(rpm->n_inodes, sizeof(*rpm->inodes)); ++ if (!rpm->inodes) { ++ rpm_free_inode_temp_hash(temp_hash, temp_hash_size); ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't allocate inodes array"); ++ return ARCHIVE_FATAL; ++ } ++ ++ for (i = 0; i < temp_hash_size; i++) { ++ struct rpm_inode_temp_entry *e = temp_hash[i]; ++ while (e) { ++ struct rpm_inode_info *info = &rpm->inodes[ino++]; ++ info->n_files = e->n_files; ++ info->files = e->files; ++ info->n_processed = 0; ++ ++ struct rpm_inode_temp_entry *next = e->next; ++ free(e); ++ e = next; ++ } ++ } ++ ++ free(temp_hash); ++ ++ rpm->inode_hash_size = 1; ++ while (rpm->inode_hash_size < rpm->n_inodes * 2) ++ rpm->inode_hash_size <<= 1; ++ ++ rpm->inode_hash = calloc(rpm->inode_hash_size, sizeof(*rpm->inode_hash)); ++ if (!rpm->inode_hash) { ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't allocate inode hash"); ++ return ARCHIVE_FATAL; ++ } ++ ++ for (i = 0; i < rpm->n_inodes; i++) { ++ uint64_t raw = rpm->inodes[i].files[0]->ino; ++ size_t bucket = raw & (rpm->inode_hash_size - 1); ++ ++ struct inode_hash_entry *e = malloc(sizeof(*e)); ++ if (!e) { ++ archive_set_error(&a->archive, ++ ENOMEM, ++ "Can't allocate inode hash entry"); ++ return ARCHIVE_FATAL; ++ } ++ ++ e->ino = raw; ++ e->info = &rpm->inodes[i]; ++ e->next = rpm->inode_hash[bucket]; ++ rpm->inode_hash[bucket] = e; ++ } ++ ++ __archive_read_consume(a, hlen); ++ ++ return ARCHIVE_OK; ++} ++ ++static struct rpm_inode_info * ++rpm_get_inode(struct archive_read *a, const uint32_t ino) ++{ ++ const struct rpm *rpm = a->format->data; ++ struct inode_hash_entry *e; ++ size_t bucket; ++ ++ if (!rpm->inode_hash) ++ return NULL; ++ ++ bucket = ino & (rpm->inode_hash_size - 1); ++ ++ for (e = rpm->inode_hash[bucket]; e; e = e->next) ++ if (e->ino == ino) ++ return e->info; ++ ++ return NULL; ++} ++ ++static enum rpm_cpio_format ++rpm_get_cpio_format(struct archive_read *a) ++{ ++ const char *magic = __archive_read_ahead(a, CPIO_MAGIC_SIZE, NULL); ++ if (!magic) { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Premature EOF"); ++ return ARCHIVE_FATAL; ++ } ++ ++ if (memcmp(magic, CPIO_MAGIC_STR, CPIO_MAGIC_SIZE) == 0) ++ return CPIO_STR; ++ else if (memcmp(magic, CPIO_MAGIC_SVR4_CRC, CPIO_MAGIC_SIZE) == 0) ++ return CPIO_SVR4_CRC; ++ else if (memcmp(magic, CPIO_MAGIC_SVR4_NOCRC, CPIO_MAGIC_SIZE) == 0) ++ return CPIO_SVR4_NOCRC; ++ else { ++ archive_set_error(&a->archive, ++ ARCHIVE_ERRNO_FILE_FORMAT, ++ "Unrecognized magic"); ++ return CPIO_UNKNOWN; ++ } ++} ++ ++static uint8_t ++rpm_is_eof(struct archive_read *a) ++{ ++ const void *p = __archive_read_ahead(a, CPIO_END_MARK_SIZE, NULL); ++ if (!p) ++ return 1; ++ ++ return memcmp(p, CPIO_END_MARK, CPIO_END_MARK_SIZE) == 0; ++} ++ ++static uint16_t ++rpm_be16_at(const void *buf_start, const void *buf_end, size_t off) ++{ ++ off *= sizeof(uint16_t); ++ ++ if (!buf_start || (buf_end <= buf_start) || ++ (size_t)(buf_end - buf_start) < (off + sizeof(uint16_t))) ++ return 0; ++ ++ return archive_be16dec(buf_start + off); ++} ++ ++static uint32_t ++rpm_be32_at(const void *buf_start, const void *buf_end, size_t off) ++{ ++ off *= sizeof(uint32_t); ++ ++ if (!buf_start || (buf_end <= buf_start) || ++ (size_t)(buf_end - buf_start) < (off + sizeof(uint32_t))) ++ return 0; ++ ++ return archive_be32dec(buf_start + off); ++} ++ ++static uint64_t ++rpm_be64_at(const void *buf_start, const void *buf_end, size_t off) ++{ ++ off *= sizeof(uint64_t); ++ ++ if (!buf_start || (buf_end <= buf_start) || ++ (size_t)(buf_end - buf_start) < (off + sizeof(uint64_t))) ++ return 0; ++ ++ return archive_be64dec(buf_start + off); ++} ++ ++static inline size_t ++rpm_limit_bytes(const size_t bytes, const size_t max) ++{ ++ return (bytes > max ? max : bytes); ++} ++ ++static char * ++rpm_strndup(struct archive_read *a, const char *s, size_t len) ++{ ++ if (s == NULL) ++ return NULL; ++ ++ if (len == 0) ++ len = strnlen(s, STR_SIZE_LIMIT); ++ ++ if (len > STR_SIZE_LIMIT) { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "String too long (malformed?)"); ++ return NULL; ++ } ++ ++ return strndup(s, len); ++} ++ ++static char * ++rpm_strread(struct archive_read *a, size_t len) { ++ const void *p; ++ ++ if (len > STR_SIZE_LIMIT) { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "String too long"); ++ return NULL; ++ } ++ ++ p = __archive_read_ahead(a, len, NULL); ++ if (!p) { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "Truncated string"); ++ return NULL; ++ } ++ ++ return rpm_strndup(a, p, len); ++} ++ ++static void ++rpm_strcat(struct archive_string *a, const void *s, const void *buf_end) ++{ ++ if (!s || s >= buf_end) ++ return; ++ ++ archive_strncat(a, s, rpm_limit_bytes(buf_end - s, STR_SIZE_LIMIT)); ++} ++ ++static const char * ++rpm_strlist_at(const char *p, const void *end, uint64_t i, uint64_t n) ++{ ++ uint64_t k; ++ ++ if (p == NULL || i >= n || (const char *)end < p) ++ return NULL; ++ ++ for (k = 0; k < n; k++) { ++ const uint64_t max_len = rpm_limit_bytes((const char *)end - p, ++ STR_SIZE_LIMIT); ++ const uint64_t len = strnlen(p, max_len); ++ if (len == max_len) ++ /* Unterminated or absurdly long string. */ ++ return NULL; ++ ++ if (k == i) ++ return p; ++ ++ p += len + 1; ++ ++ if (p >= (const char *)end) ++ return NULL; ++ } ++ ++ return NULL; ++} ++ ++static void ++rpm_free_inode_temp_hash(struct rpm_inode_temp_entry **hash, const size_t hash_size) ++{ ++ for (size_t i = 0; i < hash_size; i++) { ++ struct rpm_inode_temp_entry *e = hash[i]; ++ while (e) { ++ struct rpm_inode_temp_entry *next = e->next; ++ free(e->files); ++ free(e); ++ e = next; ++ } ++ } ++ ++ free(hash); ++} +diff --git a/libarchive/test/test_archive_read_support.c b/libarchive/test/test_archive_read_support.c +index b0c9280..bc256a1 100644 +--- a/libarchive/test/test_archive_read_support.c ++++ b/libarchive/test/test_archive_read_support.c +@@ -91,6 +91,7 @@ DEFINE_TEST(test_archive_read_support) + test_filter_or_format(archive_read_support_format_iso9660); + test_filter_or_format(archive_read_support_format_lha); + test_filter_or_format(archive_read_support_format_mtree); ++ test_filter_or_format(archive_read_support_format_rpm); + test_filter_or_format(archive_read_support_format_tar); + test_filter_or_format(archive_read_support_format_xar); + test_filter_or_format(archive_read_support_format_zip); +@@ -140,7 +141,6 @@ DEFINE_TEST(test_archive_read_support) + test_filter_or_format(archive_read_support_filter_lzip); + test_filter_or_format(archive_read_support_filter_lzma); + test_filter_or_format(archive_read_support_filter_none); +- test_filter_or_format(archive_read_support_filter_rpm); + test_filter_or_format(archive_read_support_filter_uu); + test_filter_or_format(archive_read_support_filter_xz); + } +diff --git a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c +index 1c421df..550b5be 100644 +--- a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c ++++ b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c +@@ -97,8 +97,6 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm) + return; + } + assertEqualIntA(a, ARCHIVE_OK, r); +- assertEqualIntA(a, ARCHIVE_OK, +- archive_read_support_filter_rpm(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + extract_reference_file(name); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); +@@ -121,7 +119,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm) + /* Verify that the format detection worked. */ + assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_BZIP2); + assertEqualString(archive_filter_name(a, 0), "bzip2"); +- assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC); ++ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_RPM); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c +index 6062c48..11dbbb4 100644 +--- a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c ++++ b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c +@@ -97,8 +97,6 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) + return; + } + assertEqualIntA(a, ARCHIVE_OK, r); +- assertEqualIntA(a, ARCHIVE_OK, +- archive_read_support_filter_rpm(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + extract_reference_file(name); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); +@@ -121,7 +119,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) + /* Verify that the format detection worked. */ + assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_GZIP); + assertEqualString(archive_filter_name(a, 0), "gzip"); +- assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC); ++ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_RPM); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb index 01a5249a88..3b3824e778 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb @@ -35,6 +35,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://0001-test-skip-ppmd8-aes256-streaming-test-when-no-crypto.patch \ file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ file://0003-Remove-bidder-name.patch \ + file://0004-Convert-RPM-reader-into-a-proper-format.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/" From patchwork Tue Aug 25 01:33:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96225 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 D9599C61CE2 for ; Tue, 25 Aug 2026 01:33:41 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12513.1787621618429583080 for ; Mon, 24 Aug 2026 18:33:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=ME8povQo; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P1ArBv4031005 for ; Tue, 25 Aug 2026 01:33:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=csRGpSn15BLRLyg2wG90rkvxxOal3/d2IS4AIcVjFNQ=; b= ME8povQosQ+lkzGwmX+NBlM/jHOmhGYhTashd/ksrX333GHKFmfAp98pS40XICbn 29H6wQ0XceXuYuJTN2r6ZgZ53a9i7LYb619hc/OdqHA17wcD1ddvvhpgJMACjTE1 HSd2hepOS4A3ufGaQFn2/FPDdf0+bXRlG68/cmrDCpaazooSk4bI99WeqZ8TGOBE DVgGJcm4l4KsVEwiOzRWBp8Wfjq0d7dz+xBdU6hmorcT8WTcFOoeTgB309ARxzV6 G/q7NrvK82rm+XqRFl2PLtUkqakzzlQOgalbjx3ZQ8ZyaM/lEaycYwKXo78VtnDF I3JByBP24yXKSzQ6UluHpg== Received: from sj2pr03cu001.outbound.protection.outlook.com (mail-westusazon11022093.outbound.protection.outlook.com [52.101.43.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6uqvw-4 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 25 Aug 2026 01:33:36 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HMvPuk4lF/7vCFHIY6G43Fceso+0EVPFlM+b5P6+Qx1pKoS9f5Eono0TirdC1g6h56z2Fc2GfLBn7ErKv1T0AWVTypxxfe1GyW3gQOsGS+OK/BokjQZ25Y6UuzMza7XdNgHwZDgObFUJU4Hh37jpGskN35Ftq4pvvtKjBMZKX8XEOyooc6hAEjQH4cJackQHzExrJ7OisAg54AkXWoEq7u8XovTdn+d0bfITzSxMA/m+Ea1wAHHKwKjqC69u0mF7tVggF2fWqZDBfC2C/TvMQuXqxvK8a91GmFTLPqNP9tIsuZ0/1zAsJoTlW+MtazcSJmIJVG/NZYc5koB/evZDzg== 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=csRGpSn15BLRLyg2wG90rkvxxOal3/d2IS4AIcVjFNQ=; b=I1AASz6gpbBklkksC46Nf44SqhGlv6atf3yd5Hpm3V3waBxM0NWPfY1LggSYCUOzyNc3oaorZO3iw+8Y3SJETNbPJHr8SO0dTKBQQ8Ee14N+ZfWmEkssUDkV91RQQRAlSFP4VlmKsiwPN99UP4x74/+G3BKhc3OZU0lcDC5dlsmkxjo+FTFe1CHAH6kmC28FMJCRqoAI2/amUgmZiVZuNxdRxzv1js4ve8UWKjw6/WGiKg7NLJ2+1+/0rOmIJYQ8DW8CHsmkyzOwsN3ehm37rad+vzYxbuwL+NUCY2zLx3Dh5UT8b3cZxkzTPtJ5iC+nGK0fIeWWtLrxFBtabigdqA== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by MN6PR11MB8196.namprd11.prod.outlook.com (2603:10b6:208:47b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:34 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:34 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 10/14] libarchive: Disable RPM filter auto-bidding and update huge_rpm test Date: Mon, 24 Aug 2026 18:33:08 -0700 Message-ID: <20260825013312.2695028-11-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|MN6PR11MB8196:EE_ X-MS-Office365-Filtering-Correlation-Id: f37046c0-cf99-4cfb-d516-08df0248e105 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|52116014|23010399003|12006099003|22082099003|18002099003|11063799006|56012099006|38350700014|6133799003|10067099003; X-Microsoft-Antispam-Message-Info: 323B/+m4ZisUUU71linaEyDRDM+DzN2RsKPohz1LjXEghT516iXzm2vck1FMZD0pCQ95QNsImnwkP8yfUtM0BaVeZMEHr46rWZPmMzFcsb54SmW1+c/BVsqw8EGyLyAZs+0h0o/Egr6Vk7A4Nmne19GjfERb3voWtsK0OCQD8YVKynn0wQxPEFJRxRymtmPWbVUKQ4VIBrn8bGbAFkV+WrI09rmdUBee5xJnQ5ebJvRgQXBX4PRt2J4uJdOwHd9G4H1+MnLhTYpfMntWg1R2w6kz66qXIARSM2Uu07jdHaSZaCTedKo2MMAGKvNqCSh9Ugor7oX+GWIvBeG9GyUs5i07eTqw3W7VNqE48uly6gA2ijDtUh7PLDFMtGAaI6wOCijQZZyhV+EIgA/pLsCKfXI3W1sodWcv/z0CDYKI+QAI3gDH6uPvcdQgTfCgzDFLBPWucB2cG6EB1YTNsIFw89NjCabjcxjrzQ4WZaKPtv2BBjzTgIz+nKlutgSefO5F2hzXyZBKp5BvsOACcaZqSg4RG6HWPNq1SIK/HaCibF6XL4MXGBvmLleStD5rLdNfbAL+PJdoIkaLhvUrAkHYzXnczMQQFx84+U9UHbMCISG/wmlj2Av7qI9qdO6LCt+DlVCBgSZPe78MrPCS7K7zCXIiKFWyQT7TjVavp+bWV9s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(52116014)(23010399003)(12006099003)(22082099003)(18002099003)(11063799006)(56012099006)(38350700014)(6133799003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jc7I7W/Kq7XIHLM6NXsaCIzQZjGdGyj7G0OeuPe4sSIeHkYGITrIQORWR58q/P1ZeuRT3ATebRpuY4U0cTyUWYQDqWiOY8SNB8GPG7T4i4QM2wgxduS49Jqla2iz9c2+ZLKuPur+Ux6lVQLJpLdgl4wyr9X9MqlIZSN1VzkRa6QGnIIJhXVqFL6WxIupHATynLbpQwIz/6pxVl8SZm3lDj67U7TsAt3afKj/th3YrAqIql9+CBOApqFruKMpm0LUJWz64gsZbpn2vaZ46YJ6ms1GZS/moTqPbkJJrWbZHESdMr3obA3TS+buG1jF2fozq9qwufneHA3RfEJvRWC7e+fXi6fwTF0f0/kBrP8EnHaW460Vn0hfSpdYr0cqY2AYaphbYBYJQ4cimxPTx15wC1tKXNf/j8ql5blqtbx1H71ACQTbKsjXzOSN5Wby1Nva9T4OzprWZ5SwegMZqTB2k18rIU2W3cUpUCWb/bqsSWOgwtRBbchXfsRNO+1run16A/ESKhC+GxmKRr5RaafBWLIXOirP/GKl/EpUeLdGZc7cqm208mSSHszWfBn9v/9JzxoM2/rgGkm737w2OMEZNx1ykQrK/iszLlFCtSisYC+kinSCrYI7QcDbYz3mV781efZCGh1G9IyzrHWhNbijzm0D2R79JS0P3JwB2RgNB3CfYhA3f459dbBdoNbdcizg6Zht8A3+MDGEUEIiQhSueNoqu2LlhfjQt3D9heIFEzc65pdqaKKFYjtzhDYsBtkh8FoRr0MSuNKNyGYvYzKQrsQ+nPtm5gcfEGjv3qFoOI+L9t2fDdK4nAp1R0VkpK58/gpIRa/W1eXzeH0oAwdhLagTPDD63h2ls2j3jMZlGV04j2EpSClUAcgxZqPp99Su1CIN43a86ZnNBRjP7OhMho0fBIUiQOG4quxjt+jKRH8qDdZprRAAOjHDKkdlGkfZ4/CWWvRTlyilaU51tyqci88Mh1s75aYd0Qso+BsUzU1nXJCFP9maCw4HClrXoxu72G47RxIC4tOucE5ME/n9YrUTF9MIy/lKY8Xl2Dp7gE3MauZF7+DvUfxc/P6aj9SJWgPci1RlPXC2baImXTrEBkMf00UEbZWCPU46RedzVRHqUaRBYLHbCEvgCUd/H45YKyxL9+/StfpzxNDtBHjeJLmG8j71keWN46SyRq7+3rIi9+5t4i99UQ2kq6/tQvnp2UmN5syZZOaIR2gsvQaHY+TlQv/BQBrkTGy4IpNrD7iVQannfFb5jxI6OICD/1wQ64mLDozFIsFavYjjxWkq39stDBMRE+QbSxiQiUHMGGmnvyxZNOasL66VrqoFGC1QxLVc9YynYEEUGfrjR8enzUeET4z4WUgonNq94Jo149HgA6XiKMGoWgLoDlzNR/q3eAizfM10OOngzEcUEBUEtQ+9S34fmFon9QEuCswwfy7fw9JBFN1c+IZUHYH67q7ETLNJ+MObB2ZqhXz7To5rVk86tCs8gOmdc6WhXi8kx5CFjJ9O9Hd5ndhy8gErku1JJqwm5W0F+9GstazN5Dn1LWsuNdhWzZN8CbesewHy3LfflB4kLWXEru/OWXLBpvz2fo7Q3r/t+onmE+Dt4DquPZ58OGCG/YAKkrJFx7t2AKJn2lSsL7UQL078/+Y+wgMm7w0D0F3p/OcuYOJ3O4EC002t7iSrc2FpFTpbBRMBagCgIwHwip41LyrI9LLvkQuyOW4EUxrYlJR3/3X0Nm+9E1YUCMrF8DpHgJ/hrcVMnPc= X-Exchange-RoutingPolicyChecked: sK/gmN6SV/ZoneBUBNV8U1QneMWCEpBwORGwL6ni7eyJN9gz/aKygLN7Vsg0PZ4Kn5A2rmILUYKhgbYYbt0/kg6wKXiUlGvbOYfd5xhobMqgDvQ45mdyk+yVBexG+pUQ0/I2kHmPO5lzIfQUl47zDH4Y3VEF32IaIeQCo/w4At5JE+Ul7jFFM022qJn6qyyKDTelzg5TqS7JmDX3cNdutZGz6cSn/UPLpL1X8gHP/Awm/WA3vOQvp+dSkHCKCDhGDcoHYrwcP33G1eJa2ujpbAHhk5EDi3jQTaxHlQD0AlGBfsGhyI0+r/I+OpJI+5IxJcU45EGMXP5Gr0xlqwMlfw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: f37046c0-cf99-4cfb-d516-08df0248e105 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:34.8050 (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: z5M3xMtZiQY2VoMjndBezFISIZB3hqpBL2hWzt9W1xK3IZgjIbKMajWhLUOg6AJs0WfB8sSlo+MD99hP2zaugQ5FtOSQGybWL76e3/7jSTI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8196 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX5bYWFAYjRpNA yLz7hQxf2qF6Q5Bwyz+NTUOzUO573Q4lFGv2BQSn4cy69CWjkVSOthv25f15wPiHgGj2buOZHy+ B3E3HmiL5eyiX1gKO1ZWX9yhspbcV1eTA5e5NOsn7fZJ6Dw4rBL1 X-Proofpoint-ORIG-GUID: n3DLUSF_M379BWB1QdaSULO02EuFjbU2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX8mVHfPd8bt0r yx11UOO+FxWuo9Nhy+TrGWEujxRUW3YN5DUxxVlBy9CUt9ofZgixXLgZPWcYwbNebyzFUu/my4m 3Vzw0gy0PCZ8ceJP1zxanmDeX6cB645QhB3mr6pHcgIq62XwJqodkZ1zRZcBMUFxrDv8jkwtjWF afUWoFqazo7KjT8G/30ylH+vu88mm94AIigOS77RSx5v0tVlVHMc4mEuDp0hfrKzzRX8WkFbEKy 7/UD+RfNabbISqZtiHtkV6fDIa8SHN0alyfJmalf2sThVj+ACvNMV/2S/o7Kx/7g7KS4zNhRsZY ohv1CybGqEdZCYXI2RQAKQV/EEF2y6nlCLIlJ5acn1vNt75/lsRdM4ut0Sn/pKOxOZ752i6lsOs HJ6jTYas7Kd62ylxlGg9znlgbqWk7JPU5uaYhdAwef59lCPpAmrNy6/6hCjuJyGBIfS1TWGZ/qC F9G85FcTBLgVoalRa7A== X-Proofpoint-GUID: kJcx1BdmhnA14zQn0nBQHiL8-pfhK39s X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8cf0f1 cx=c_pps a=+CKpLqsC5QamL8vULJ+FWg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=fTW__CHxibyLmBMfj2wP:22 a=NzkYBEk6AAAA:8 a=NEAV23lmAAAA:8 a=3uWsZ661AAAA:8 a=t7CeM3EgAAAA:8 a=9_fcTNOi7W61J8-o3-UA:9 a=DC3Xf0KLC0SIM7_k:21 a=zqED95DPWUTvcrp2mxve:22 a=fYNom5PXsM5enKJDCoVv:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 adultscore=0 bulkscore=0 malwarescore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244182 * Add 0005-Disable-RPM-filter-auto-bidding.patch: - RPM is now handled by the format reader. Disable the filter's automatic bidding (return 0) so it never intercepts RPM files during normal archive opening. The filter remains functional when explicitly requested via archive_read_append_filter(ARCHIVE_FILTER_RPM). This ensures debuginfod and other tools that use archive_read_support_format_all() will use the new RPM format reader for RPM 6 packages, while maintaining API compatibility. * Update 0004-Convert-RPM-reader-into-a-proper-format.patch: - Include the test_read_format_huge_rpm.c changes from upstream PR #2846. With the filter no longer auto-bidding, the format reader handles the truncated test RPM: opens successfully (ARCHIVE_OK), returns ARCHIVE_EOF on next_header, and identifies the format as ARCHIVE_FORMAT_RPM. Signed-off-by: Sumanth Gavini --- .../meta/nativesdk-sdk-provides-dummy.bb | 1 - .../recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +- ...vert-RPM-reader-into-a-proper-format.patch | 42 ++++++++++- ...0005-Disable-RPM-filter-auto-bidding.patch | 73 +++++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 1 + 5 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index 6075770bf0..37dad54409 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -11,7 +11,6 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ - /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \ " diff --git a/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb b/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb index 471433e7b5..0249c87878 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org" BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" -RPROVIDES:${PN} += "pkgconfig" +RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name. diff --git a/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch b/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch index 29d12bb539..03a207f33f 100644 --- a/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch +++ b/meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch @@ -11,6 +11,14 @@ Without this patch, debuginfod cannot scan RPM 6 packages: libarchive error: cannot open archive from pipe: Unrecognized archive format +The test_read_format_huge_rpm test is updated from upstream PR #2846 +to match the format reader behavior: the format reader opens the +truncated RPM successfully (ARCHIVE_OK), returns ARCHIVE_EOF on +next_header (no valid entries in the crafted file), and correctly +identifies the format as ARCHIVE_FORMAT_RPM. This test requires the +companion 0005 patch (which disables the filter's auto-bidding) so +that the format reader handles the file instead of the filter. + Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846] Signed-off-by: Sumanth Gavini @@ -29,7 +37,8 @@ Signed-off-by: Sumanth Gavini libarchive/test/test_archive_read_support.c | 2 +- .../test_read_format_cpio_svr4_bzip2_rpm.c | 4 +- .../test_read_format_cpio_svr4_gzip_rpm.c | 4 +- - 14 files changed, 1162 insertions(+), 15 deletions(-) + libarchive/test/test_read_format_huge_rpm.c | 13 +- + 15 files changed, 1169 insertions(+), 20 deletions(-) create mode 100644 libarchive/archive_read_support_format_rpm.c diff --git a/Makefile.am b/Makefile.am @@ -1398,3 +1407,34 @@ index 6062c48..11dbbb4 100644 assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +diff --git a/libarchive/test/test_read_format_huge_rpm.c b/libarchive/test/test_read_format_huge_rpm.c +index 51208c7..10c7fb7 100644 +--- a/libarchive/test/test_read_format_huge_rpm.c ++++ b/libarchive/test/test_read_format_huge_rpm.c +@@ -26,6 +26,7 @@ + + DEFINE_TEST(test_read_format_huge_rpm) + { ++ struct archive_entry *ae; + struct archive *a; + const char *name = "test_read_format_huge_rpm.rpm"; + +@@ -33,11 +34,13 @@ DEFINE_TEST(test_read_format_huge_rpm) + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + extract_reference_file(name); +- /* This archive is truncated -- if it has data, the bid has screwed up */ +- assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_filename(a, name, 2)); +- assertEqualStringA(a, "Truncated input file " +- "(needed 34359738384 bytes, only 10256 available)", +- archive_error_string(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); ++ ++ /* This archive should have no entries -- if it has entries, the bid has screwed up */ ++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); ++ ++ /* Verify that the format detection worked. */ ++ assertEqualInt(ARCHIVE_FORMAT_RPM, archive_format(a)); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); diff --git a/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch b/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch new file mode 100644 index 0000000000..26a0159908 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch @@ -0,0 +1,73 @@ +From 882166d7fa113f0c2108864b8a579d01816e1fce Mon Sep 17 00:00:00 2001 +From: Sumanth Gavini +Date: Tue, 11 Aug 2026 12:02:31 -0700 +Subject: [PATCH] libarchive: Disable RPM filter auto-bidding + +RPM is now handled by the format reader (archive_read_support_format_rpm). +Disable the filter's automatic bidding so it never intercepts RPM files +during normal archive opening. The filter remains functional when +explicitly requested via archive_read_append_filter(ARCHIVE_FILTER_RPM). + +This ensures debuginfod and other tools that use archive_read_support_format_all() +will use the new RPM format reader for RPM 6 packages, while maintaining +API compatibility for code that explicitly appends the RPM filter. + +Upstream-Status: Inappropriate [OE specific - keep filter for API compat while format reader handles RPM 6] + +Signed-off-by: Sumanth Gavini +--- + libarchive/archive_read_support_filter_rpm.c | 37 ++++---------------- + 1 file changed, 6 insertions(+), 31 deletions(-) + +diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c +index 01bd1bf..8e90da3 100644 +--- a/libarchive/archive_read_support_filter_rpm.c ++++ b/libarchive/archive_read_support_filter_rpm.c +@@ -79,39 +79,14 @@ static int + rpm_bidder_bid(struct archive_read_filter_bidder *b, + struct archive_read_filter *f) + { +- const unsigned char *p; +- int bits_checked; +- + (void)b; /* UNUSED */ ++ (void)f; /* UNUSED */ + +- p = __archive_read_filter_ahead(f, 8, NULL); +- if (p == NULL) +- return (0); +- +- bits_checked = 0; +- /* +- * Verify Header Magic Bytes : 0XED 0XAB 0XEE 0XDB +- */ +- if (memcmp(p, "\xED\xAB\xEE\xDB", 4) != 0) +- return (0); +- bits_checked += 32; +- /* +- * Check major version. +- */ +- if (p[4] != 3 && p[4] != 4) +- return (0); +- bits_checked += 8; +- /* +- * Check package type; binary or source. +- */ +- if (p[6] != 0) +- return (0); +- bits_checked += 8; +- if (p[7] != 0 && p[7] != 1) +- return (0); +- bits_checked += 8; +- +- return (bits_checked); ++ /* RPM is now handled by the format reader ++ * (archive_read_support_format_rpm). Return 0 so the filter never ++ * wins automatic bidding. The filter still works when explicitly ++ * appended via archive_read_append_filter(ARCHIVE_FILTER_RPM). */ ++ return (0); + } + + static const struct archive_read_filter_vtable +-- +2.49.0 diff --git a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb index 3b3824e778..2eefa28532 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb @@ -36,6 +36,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ file://0003-Remove-bidder-name.patch \ file://0004-Convert-RPM-reader-into-a-proper-format.patch \ + file://0005-Disable-RPM-filter-auto-bidding.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/" From patchwork Tue Aug 25 01:33:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96223 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 BE3E5C5DF81 for ; Tue, 25 Aug 2026 01:33:41 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12515.1787621620196725211 for ; Mon, 24 Aug 2026 18:33:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=fwJeSsUG; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P1K2FK085912 for ; Mon, 24 Aug 2026 18:33:39 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=QGvlrlWArdVviZENMUVVcISa3tiJlqfQvViIAGrgaho=; b= fwJeSsUGhRJBuTFheIcCtHl2A56x2rHXISSX3K+6sd5xpy+EHyuddyYBBgS0SULJ wMeb2nD6fYmwTmB6pNrWvg/RQ/Zg7a6F+9Wi1ocYRMoVSISV1jKjXltap2wbbjQ9 lfGUf4vGx96Ixq7w9IOBVYPkYqXpxcmUwLry3dxM0/6rUqGGWi3DITUs4eSzWFe2 xaL/3J/k4NRj+FtcnPmPD83hPZ8vgfU2Mj4he4E2JzOndkuVKfr9TimUolVWrgNL coV0NlFrPK5N8HXGF08PkZarGSqsA3XAFF6qZEuAOeylEfqA+3KN+ZWJOP29NDD1 pUVVTXNn/QTU4KBVq6LaPw== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11022139.outbound.protection.outlook.com [40.107.209.139]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721kme9-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OdVONtlZNb6IDo83Uk6d29YsE5qxw46306CqoIUwSAphb0Dv/oEQrs64JMivab70ZvvZiB6gu/qUz2cNdnBAmiwHQE/U3jLmyczHNToB9Gqhkl2tRxnO5iU9tXHMfPSzxWVX9NYiL9qt7JgjV0fW4hFHwG/HikVb4GmSFfpnkNUxokJTEWrgHRLKu7nIrsyARzIWhui+tPxZOeKby579KUdSDaB4k+u+9blZzRwzZ4mPFhqXnTqKkqznJcLRh5XP/SsYDrfz9AOd6p69+bkdSuuz1km5HejvcB7TAXDOGT1Idi12HSHKPQEA1rEQH3TqLTUveBAO0nW8pKlhKeHZrw== 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=QGvlrlWArdVviZENMUVVcISa3tiJlqfQvViIAGrgaho=; b=M2g8+zCH5ItwZzCKm94CX58CI5qiLWsnFVahnzhyD8hcNrWRERZDvyDZLkqJqZHoAfGom/nCj5kUg6Fp+6XHQjlblkGkQHgswZ1okXiqOWtCCuQgdfTIflr1PblzvaybXO+G9kaABH+nRMnJlBQErgA8dI8OWciCQD97AG6MjFrCd/v+4yd6vjTyFRmhVNvySZLsz2qxENE9kVL0hWER89M/+CUTVwPhGgAzpAcWnvMow9GjMofYtRpf1JUe1lqdN1dYAppEk6mIqh/xgasuvx4aiicxzkJNYV5PGriYrYl41ez9p5/bpdoCx83gR5HPDreZnfC2pJHqt4ho8Eq1gQ== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7719.namprd11.prod.outlook.com (2603:10b6:510:2b4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:35 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:35 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 11/14] package_rpm.bbclass: Suppress pkgconfig() Requires for sstate compatibility Date: Mon, 24 Aug 2026 18:33:09 -0700 Message-ID: <20260825013312.2695028-12-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7719:EE_ X-MS-Office365-Filtering-Correlation-Id: e3a4be9c-7316-44c6-4398-08df0248e1ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|23010399003|366016|5023799004|11063799006|10067099003|56012099006|18002099003|22082099003|38350700014; X-Microsoft-Antispam-Message-Info: wJTku2qPf3DNUeAb9JAtp40PVyVIL1tnRJWQYeNJT05OncM69asnm2OttmL+zcDlfSvvO3FbkMmWfdNQHmfM6G/bCkC2IgXHzfSk2kYBMFktt4zA7OPeiRjgvaaVRR1lHYeXLyyTsUans1lMPeYvMN65dGNcxCCyZzvJWIWWOeTIuAX0RW48DwM9bABoEgkXUwK3oA9tBbbBLmYlUi/Lm7yN+27BKzuCD74UfhyBRTxkQPuM84bGxocJyj+1dvnE7cXFaIWGIn/YUBEAOcnw+dDtjQjNdhlnxOLVYwUaGW53uQtPkDQ3EAsbCi8Gv+IhH41xdjJq5QMgZAE82rd/dNH7YCNPCizYu7NIkCkwQwZOVkp6SAA7HoKCYWqDYDxMN3N5T8L66Z+3uXCl0xK0qNoCNrIbxtosPNZieL1H69tnPNc9WqEEGjeAIWMmrc0fiH1KjNwNU4LDsbxaxwQL9a+feJBkjBPSe76upJWbvKan2hDw5Bh6jQETUDHlgZdFg024fAblOUiyH9SadyiGDvOp7SLmyn8F7Z3eZuidtqbqB1OinlosrZcfSMLJ0aZr4iVC9ykIf/vh585pl19kN6Lr25MgLX1FXcLCNDQKo9UcPpjMtLl99O+Gag4QMq97gC6GcExLWO53ydBq6WBl4U4odnUO86DXKr0mKWEhK/4IJjARHCTrL3qnXqFKqDWcNnJD3u+qPq4YupZe5ih3mgJ1eNBKil2crI1q4jwwcp4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(23010399003)(366016)(5023799004)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Crndee+DgSzizxKew3SIlYS9GXU0qJG4r0/MlBwtoRsfMwxszl1fYy4equCfXhEEksvNn+1TZiPyjSKnODSS9pq/mg/Ho3BXtgWh4v6iF41EALrjwMI1BhnO0HbVaRzMELWMZ6LFEtoFq+VdXWjt7z1tvlPVy0tyRffHqVykpPun6xjCjuDjjzKwXa0jABudwx639buS1EcPdFjcIUPiVNncL/HCWiVCoI5xzQcllKqp4UqcbtT5KvONQyxx6Iue99Qu/F5QUw6H8T6CIKvdQAMzaqLW/V/K0krAvBhRDrbTIuNwfOXetljNbvzWC03EHcwExTIjH4P1bnre3dkN6DKuXvTLR68RFQCvjEdYahcA7gKLRYV8rsw23Vhk51GiMZX2tP/7sHTXzufPFI9aC2xfEZF+lVe7/vN+SJFRZTnJ4WXM5fvVBAybhAfp6vwEhcguCLlCfbDeP/k+e9+WDIGgmVqMPlP/tcf7Sc9LBlN6PaT9lrh4xewBvsULfGI1OOxmdZ3rr9toj2rYO83NfPtcmhX6JfsnmPTjZdGpupELaD7OohwYzsn+JhuIGriOiCe08v99+oJupOgWNN/7A1bTEza+5uhV5iWRPZcfc0bkDDG6fqjronY7t2JOKAHZ8ZC9xeI8k9LZO7Vm1tpjKds97qHw5ce36Wu+YLOGxjmi7I5PT/kPF2npfvCfZ3xKTxBGKuU6unLjvXevWcYhbFCyJ0z5WDVlNCeMY4Y93VB1yDNvCi/n6yh+DJmWsjoSwLvC9KpntuRptxJ/amdcd1pwCoenBEGomS86ggviKQ+u9fUH/99vAEMPNsUhEHdobOWC6nGx87ymhCMrliyA6LFYmiJh2cRSiHz2FsQe2xRMJ6/WLRJ6kJUMfNeRSkep3M11qKWnugblL7oz6HOMhNLEZyoTqgsrW2KEpeRZ1GnKVZoAxd0gikFL5q/lDEa5wsSr8e4xi7WX77Xjo42D8lHuCKx7M2EQ4QexsKq/kHn1ga3C3+1ZL/eKKKlPQIbVr0fgk22NtbKT1zBvqARqIIka/19NYO14GfSxsouUhhhaz6oxMQ7c2sueAuH0svtcTQXL38AJD/Q3SYu5EU+NcwQ40n/FtJBp+MxwMbi2auMxEGUs3kGDc0FwHzLFWtexdRkfccmRMyE3HEuoxuL+5GNA4BFORujIR3hWLz9bMi4T4m6/YBPCS1Cl7s/cBNuRLTtxtpySvNnrFNiZR3LKnwi7tVuJhtB80HbWFQPos+VHFq46yGOd5Nl5waawa/IjxYknrBGNFb32rUEn22JeNOiUUIvZFilG5GB6fHV/ktMYgjnjrfzbDc5+yVqCRWQXpFLnhszvKuMFb/rsHxgO6MAcQru/hKFtHDkKdRZ3SVbsZhqHXGKynJSxrHHNJ4Zh2hnv7L2C5lcBLSSGcxgt8Yhh+Z2q7W7GX7OSSao04rCszm1Fl9PIhO44CwtTc8F184W56EHxJYQpDDlMXVFJxSX1eRwA/o9RuRWa3bBpweLfuph0ot2L7p6kjJ32PYZ9lms1oN8WBBcNesYuJF91dPsO3j1eyRp2YoM7ICRDfwcMLCvLQjpPIi2BOgP38vsNIXHYAJuDQV/5QsUcYFoEgSg/Oa8vpOPjIk3ueIwAI5eYZ7ZVC9WoLWn89Ozne1ch1N5Y+cxD6QuPiG49hDXZ1iH127oceWX8sfvbkOn+dGJ3BxJSv3lHVnXWi2G6jDpkSUF+KycGq0EBIUbQlssNWjMo5xAPJ5FIY3uVd1Oo+IM= X-Exchange-RoutingPolicyChecked: p4yMWC3VTW+/oxVpoQ+FTE0Rca1iDpszcRYiVgzhGyZteCLIuafFScvH67m5ooWBprW6QidEJcyfuLyAJ7b5Pd64HjZMmS4092FogYyLlrbXXOLbSySIMhp9Udvau/b++gfGqIQ4GfNE8X1+6yeiZ1BahZTQvKAXTzTq6GZ+ikyiQ/GVDvcHaAPYFshqpYBSEBClJUZF7H/zQ05KWL7qjaQUMtG33AaWWWH/o9gGp34JLX/xqcR7a5RXL6Yk/o3U7Hne0uj64rsZczbZte1T9E2JY7d67apxEoxtY79WBX3qINbu08tJw/Ycfj1ifk79hgQ/JdDMsAzBONqtSqTd4g== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3a4be9c-7316-44c6-4398-08df0248e1ab X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:35.7994 (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: WjgfQEXfkU7IiaVE0xUtAm6zqK/rcLSWW7dE+AzXdxVwjD/eBqKj2xngYOEJ12ixYPNWGdY4V6ZVuw3fFY+pUC7tXGjOKFFFI6sXEs2eBkE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7719 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8cf0f2 cx=c_pps a=A91p8pFdSY8iZOlwlHItIA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=HK-ge7EqtdluswH-FwHe:22 a=t7CeM3EgAAAA:8 a=0YVC25x4kLZrtsW4MIcA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: e44jECcVPEeLWu3K22WBrYaoCcJW7N_i X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX/yn+opj0xPNc h6Do/TMdTDCS9hSUfqhmb4A2u1Ii7MkWwm2e6rZsLIOpwr8B+LgdjY6rcxr49jhi0+8lM6JhWty dQPD7/SsPDKs/+gKx7584Y0VGZJDtuydThW5y5bzOyppbixVKBklGDhRVxV1I8AWe8IYrrllzgM wr3pN2ULXkRQxyWddc6bLMJP7ZT9MIH9I8KRAiUyKQn27oxrF/Ejq28VPkx8CWfRuPnM8y9Vgnp NmVGM50IMU6vnoQFlHiFotwtaL+O5+zItoqbQl1pFp/iOlG09Xjx/eB3vag7PMiPK7IyruaBTR5 HtDNG1S5AmIZeDCLRZEVkG15Mwq2HWQmhLBI9are7lLObgqUGZBgjWAQKHwmkg4pEUIb3B3ECw1 ylC3KqCXJ86wxiZ5lFQzMNlWy3kmVSaGpqCS22tJfRbCst+TzGPt8/Wvn/WMXui2j0kz9G9vQ57 /dG0OQZL1ce/EDSJN9g== X-Proofpoint-GUID: GfCmgRy4Ax1Lwy1uJGTn_OwpuDYHNEFn X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX88F6Y1OmkS2W 0JnC26XGSiyaA7LK0okmIdUTWHdhVlq9Ej4OmsaX3hezHW9AEutH4u8m9VRLJ87eV6YUU3hfyq8 gy34BCiUssMXLm+8v224RuHVS8DCe4Lj4wqMLqBs/QoD88BzuxuO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244183 rpm 4 had two dependency generation systems: an external generator (System 1) and an internal fileattr-based generator (System 2). OE used System 1 and disabled everything via: --define '_use_internal_dependency_generator 0' --define '__find_requires %{nil}' --define '__find_provides %{nil}' This meant pkgconfigdeps.sh (part of System 2) never ran in OE builds. rpm 6 removed System 1 entirely. For v6-format packages it only runs the fileattr system (System 2), and _use_internal_dependency_generator is ignored. So __find_requires %{nil} no longer works, and pkgconfigdeps.sh now runs for the first time in OE builds. pkgconfigdeps.sh --requires generates both "Requires:/usr/bin/pkg-config" and "Requires: pkgconfig(foo)" for each .pc dependency. This creates a sstate compatibility problem: packages built before the pkgconfigdeps.sh fix (which unsets PKG_CONFIG_SYSROOT_DIR) have no "Provides:pkgconfig(foo)" because pkg-config was failing silently. When DNF installs a mix of old sstate packages (no Provides) and new packages (now generating Requires), it fails with: nothing provides pkgconfig(zlib) needed by elfutils-dev nothing provides pkgconfig(x11) needed by libdrm-dev In rpm 6, the correct way to suppress a specific fileattr generator is via its per-generator macro. Set __pkgconfig_requires %{nil} so new packages don't generate Requires that old sstate packages can't satisfy. Provides generation (__pkgconfig_provides) is kept so packages still advertise their pkgconfig modules. OE manages build and runtime deps via DEPENDS/RDEPENDS; auto-generated pkgconfig() Requires from rpmbuild are not needed. This follows the same pattern as the existing __font_provides %{nil}. Signed-off-by: Sumanth Gavini --- meta/classes-global/package_rpm.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 51ad195baa..1e016971f5 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -599,6 +599,7 @@ python do_package_rpm () { cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'" cmd = cmd + " --define '__font_provides %{nil}'" + cmd = cmd + " --define '__pkgconfig_requires %{nil}'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'" From patchwork Tue Aug 25 01:33:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96222 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 9020FC5DF9C for ; Tue, 25 Aug 2026 01:33:41 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.12592.1787621620235925275 for ; Mon, 24 Aug 2026 18:33:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=UWdAU45n; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P1Ce7X074660 for ; Mon, 24 Aug 2026 18:33:39 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=RkSxOyy/AURg8uiuZKDCuyTOlxYRVgYEwhaIDrpa6j8=; b= UWdAU45nJA+14rL2+xkirqsSv1TeRL1iDAsHe8Y9G6uRJ5IH55v0hBhJJZitZwv3 gOJS+MskvpXVEAJpgtqT4lOR913TNBnuvj+LSoQ1OxzvQZxUXzNmu15rMJj8n8Pi XDY91S+jRE/QC+oujY8H+9HgNT+j2ppSLwVvLTHzHbdu/HRvGPXeH3Ah+uaAb38c B4tdX5GUC/WGI1S7/hilEJAYXcUdOwQiSgc8VHhX3FAYYIBSksyrSy29LwzvVcuc w8c1m/cA5WimpCTeqM/D4l3jL+UmT5s47guYy79XDtHQTq0MrrAja6rbS3Am4FA2 GGTCAv8dg2xYkXJkK9wI+Q== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11022139.outbound.protection.outlook.com [40.107.209.139]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721kme9-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WZnQ7ufXof5CmjbYQFuednCbOo9tFVWqFVslyBc4HADcdfbc6SlmA3YxhjI4DWINoVXeeVAbyeyvzlA48WLrPkmkdIhZ8vaYZB3HNhFYkv0+9VcXT8bWIhlEpnCRPWtJA2FOMLN9hZEo799ZjFa0mbsEMhQEPlvTIC14d4pnqG6M0gjzgzRpbYjEydNXldww9AeMHgkAgr07nDJmUDYXhoW2o0PkdXM5sqHMee5qYZ/zyIDFvZqfJ/whg0AvYwTboqaQqCqeRenabe4CI30KCnffBhgK4qugVOgKCsJWa6w00hZAk6kXDUTz0bxsyRhI8PLVY1oQbvwSpwbKqoycSw== 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=RkSxOyy/AURg8uiuZKDCuyTOlxYRVgYEwhaIDrpa6j8=; b=j0wmKOXdYmlfJrNFlEQNB2y8Je5fuhoQzodQ3SoGSltRKJCW3dkGsMlHjZPaQSWvyR+7iLgiJqxDgxV2TTm7jR4monzES10Be1n1fuh3zXocPd0ibonseXe1odUg1Sz7Si83zge0qkSJVkNN9QRbRJwdJzbhl3+Ohjz42N7k3jDvKi5g54LKKcyDJP11qHo88tKJ9JxII+kNTHOZDomoDA5h45hGpgxG62j6y27qwMUHx2x41TKl3SdvPptT98XChxxbkrO+q/p4qsrB0nbo6bzHBk4Ot5dFCKpfiSvDeMZeDOVvt52YWvEqvBtkL/P2v65V0UulAIq+luX5Be3W6g== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7719.namprd11.prod.outlook.com (2603:10b6:510:2b4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:36 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:36 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 12/14] lib/oe/package_manager/rpm: Enable DNF filelists to resolve file deps Date: Mon, 24 Aug 2026 18:33:10 -0700 Message-ID: <20260825013312.2695028-13-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7719:EE_ X-MS-Office365-Filtering-Correlation-Id: 967282bf-9715-4c83-8b4d-08df0248e23a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|23010399003|366016|11063799006|10067099003|6133799003|56012099006|18002099003|22082099003|38350700014; X-Microsoft-Antispam-Message-Info: bcNwBnOOImm7NCrCZrqljZsW2brecUaM9Ys2gpLwauc4dH2KSgkJbe/WoTcOdGpjid6Kg78fIb3JwPjUyJnEIjXOYiw/Jg0pMVCBbJHsOXCpYmKb6ll2MOx8UOX5dID9G+6Rj8IORa/AM2f+ScR759o1zZ8/yID4h5yrCd80mqA49L0cPacaU/Y/Kxxj5q7Qx+1CiXK54/t8goks7a90GENAwP+OPLq/mIsTxKRbBuPBiCP63DNYjQ9ZU1Ge0ZtzXmpQMeSuaYiC+qZUGOAq4IxPQho/V0bFoEX7a87ys0iaQRQ+gcqbIA7LkfQKKfnEmA31hrGkQ/JLvlh2BSxdlogWwyum7e6MgmMUZvLW3UNPFdsdFZyGsIStpao4vElUlP1yn6XJTA2p6OCH3R/p0OY/IsHc7C4+OhcIDuyg7akQFpTNsyq0RxR1GcUPCG8qP7CbpoCGgEKjYvNZ/gf1UjudMHhI/KeGynmizepecEwY+mn61Qi33RMVgrKmb963kCK99a4GmYduZesQx8xuFBNxBk8Jz7vqnbccQtFmIsEs9bkk49EbVSSqvDLTn6HI9P8NEjKb3xtXHowdiCiIhVTUevowslALr+fdLUCnu0Ardex+z7oHCv1x3uu5mg4TbcW1xlDzFw0evTWEGm48SZSjTpLSW3rw2Np42SY3gaIhAyqUKNbDXJK7ygJR48WoK2eu9XpqCCwZLKA+TE2IkDOPTuhOQFMuI5zrewSQSdU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(23010399003)(366016)(11063799006)(10067099003)(6133799003)(56012099006)(18002099003)(22082099003)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Iwb5g0G/R3giLeg8NnbcZLRFIXNTcjh7REDzZEw10NdnJ5PEsLAl18/n2kTxKn0ahDjTsAG6EpUCK3nHbXz+GkJz5ihRnHCDutkndK+Y8pWgqaV31IkbXCpX3JPN/AgHHXcqDQFu8gd9aFls0RtUSWxAkN/N1awkz6czzv9B7zEx8VC/s+C/6N2v/DLQvfdir0tQGHyY4xQfJKH3VvsRpvtdaHJs7z7KAIir++I8xNagZVs6q96Pv9r8yNA+95WkP9S6m6Rm5DMdEUpr6djAQCi8migJGPpkGJ/vAN1BVmbJP/ciUqJvNzgdCO8cK0k8XQMV5qFzVHQzDHg+Dv6KcHTwk0K+pGJhfIbkWEb75XP60STSDzOQpHd37l5ap3KJ8IPLTvTcGcmGWAjugF4H16wUf3LtLAsSR9jdgjz8jAqc2++I9PjR/rYKL8bge82oYYa+B2TiJ1cZMh5uVrKfsFgFc/B6KbaEBxZ5EAblyVurPFAHsn3znc2HzU5JjNKvJpJ/mKcpo4YjNqbax2DoNzP3cXXtYeLBkm0FJ60WWlqknzRLLTA4bkL4chdfeTBHOeIhPXB7P545OjhMlsOySmodL86eZ16brjo+iiYLPw8jz8QrmoPVS9+UxXXYLSl8ffpc5DuxJcmyqPJDA3vAoY1mzwN5MUk/A7zrxa5UcBi0M6cFymJC7kPcqPrntayO28kZeJQDTiWj6me0t6vtj9pKI0kx/0vTt4SmBjqQL8gAYOrG4Wuynj1JfFwqLgBfJlC6WITmOB8fj1r5nQPyXSRhkDoOkADrnvkJMOIF/ibbUT4mow8PGw5oGBDW/an5a1Z8R81SeF+N42omLzYFNAgLb6sN2/3B37UTefjMTE5K4Rn0vbfEDbpOf2pO71glXsyyBO2eN/1HPWulpckQrdmPRaagOs5FtOoKTiY+0Ntn/4Kh3gBcbd2R9FS3gDO7NizdZu4WHFsw5dZaYYAGN82AU6rZy3hgXYzQV+jkX3lHs3O5rI8yFy4lQZYDQuYLQbmYrducVLSt7SldUsI7oaF+bjOELLiwwIU3oTreOxrTxXqLrNseBO+dPfp099wp5QMOKr5H59+XWvTEtf/4P4rzjRc/vuVkF3V3Zcs2tUYrBv2JPCjPsYSpdBMbJREW9p5zaetA0BvBFvVP+WkcJDJd9CQLXogxdnH7Nk0pMy/CXU0/Awcm3t5EOlZYsDbwMpW4P456rm7ms/r2xJ7FEki09rGoXTRC5KATfJzsXw2Q3P7ROQxWQ0GZ2/zIUgQG3A4u8cD2qJBIu8l3rWigTEcFX+E7wh2g5/o+3JC9J1tlvPOhETgm3Sx3clLEJNQAAqJZofSZfXzOs+y7vZccf2bNnF+zV59KtNhCfGXGKuj2tG75u/5JoORlKuDw1EOPmVYzKITYUnz/A8Lx3rwpjV1pfIRvKEiobOdSxDa6CSzQj123+GwP+jUpkPCvYlKNvpINkdrC+6PcZ3Jo730Em+EuWDEQGMUCCV4iRsDJb1A1KIa+0pFB+381U16ywz9DxG8LY9K/Nji6Pz3AuSnk9xkX0elPJsWl9fRiTWnGmmSYT4GuhyAp8OrWpN79qbqYwwSv4uaKcH72F2mWKz0Q45J2Ul2zREe+TUvgvplmyiJDS2ximOP+OMyCYee3oNcvuD+wrEgNgsWUrHi33DyoE2SMoqfHPukE1w0Z5vk80vfkIsSxakDVAMdKST3EHdKtrkzn2N3ol+YuJnUOqNppxn68E9jIZ70ozN6gnmXhfDU= X-Exchange-RoutingPolicyChecked: Dsdxd62N08UswsaRlDze/e+yWmU0017yQy4nBHSCVp+85/hPrqBUgy0OPAJ3cDYD7qNAzhRqWI+BtMJKIQZOxG6ToENFWDj/UkZnG9oOsLLZTTmp++yl2AnQIbBNxqCtnNiRb6WZdPO0zqS5Mc9fk5DOFRRS8mhduPY7cPvBtQL1q0mmGP5a/eHMh6R1aLpoL8i5hfBf0e5BJieTxJ0SL4Uci8Q9Vr5UjeLuDAll+jl/yW5jfnJ5AgMbSE98030z/0vrw0Q65QurJPpg2QWjuiB+OjkLWk/lxvDhG20rrOCP4/BNJPQ0mAaJeEzH+LCsw21HRqFpKyvKJK76zYKpuA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 967282bf-9715-4c83-8b4d-08df0248e23a X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:36.7040 (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: 4bwEExpN7Cjz77pbNsLoQ/dsE/nkzdvYsYKskTkZiuJNMHtNlntSl8lwDuS7jxHWAIS0s0luoW203aWqvDF8LIVcXOM+tiaFBI0jvGWZVwY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7719 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8cf0f2 cx=c_pps a=A91p8pFdSY8iZOlwlHItIA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=HK-ge7EqtdluswH-FwHe:22 a=t7CeM3EgAAAA:8 a=p0aGjYm6jqd3QCOFG8EA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: kUXzNiUPiQG41KScZHlMXnmfP_dWvsOU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfXy/6FrDCHUNDF HuHrJLjo5V58fjqjLSFZuC1OQTlUZoTOCNVOzKKcgQEb3/czgjcDOEnrO2PSzB85sN9TFNyHC3S ZNgCvDlb0lWNbGsJLKcg7aF/0FPiHam5V1NBjOYXCd4BxTR8CfQZFba39xe5zzLzQ/xbkgyTVj/ T9+ToaNz51OUgDGRPxJhHXxi19W1V71qgB/htX3mhIUjszOsauECFHBjtkx2Vu6wwZr58C5Zzlu O39FoSLJkx3b0YeNyCt6gOJgVXH73fHX+sg77Y1Q0FEZRq+9c+dFuXjfQgc2Y450HJduNT57srE XbPoGngflEc8HZuQGmHcibjQe0eNlemK2g2NIzdeTlTnyVUKjBsECy8dCCYtlKX00Y2+UQAAlQ1 2jSKPBOKkAY/+T2s+MqXap8FqBOeVLXC9STKv5iarNDjml+tuZoSi0NpJVQCJKNk7LwhsN5EoRl sCeI46uTZ+JSBqpV0Sg== X-Proofpoint-GUID: nlyvucgJ4SjzgORDjs8Mwb7bNrozli4T X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfXx9HspBYzOVWk rDexGfj7a46II1uY/ycV40ynflK8KhSOBT39o2DogXl8B2GZTlbnQbRFPkyiEeMguWsjPfvkRgH E/jL8aNYqaqJNsMupJQhUyHyIRqnxNsz8u/HqidIDvLeaCFh7wQw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244185 With rpm 6's internal dependency generator now active in OE builds, pkgconfigdeps.sh --requires always emits "Requires: /usr/bin/pkg-config" for any package that ships .pc files. This line is emitted before pkg-config is even called, so packages built during the early rpm 6 migration (before the PKG_CONFIG_SYSROOT_DIR fix) carry this requirement even though they have no pkgconfig() Provides. DNF only reads primary.xml by default, which holds explicit Provides declarations. pkgconf now has RPROVIDES += "/usr/bin/pkg-config", but pkgconf packages fetched from the hash-equivalence sstate server were built before that change and have no explicit Provides in primary.xml. createrepo_c already generates filelists.xml by default. Enabling optional_metadata_types=filelists tells DNF to also load it, so DNF can match "Requires: /usr/bin/pkg-config" against pkgconf's actual installed file list regardless of when pkgconf was built. This covers the sstate transition period without requiring a full rebuild of pkgconf. Signed-off-by: Sumanth Gavini --- meta/lib/oe/package_manager/rpm/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py index 1d831745ff..cd6efe3d3b 100644 --- a/meta/lib/oe/package_manager/rpm/__init__.py +++ b/meta/lib/oe/package_manager/rpm/__init__.py @@ -318,7 +318,8 @@ class RpmPM(PackageManager): "-c", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), "--setopt=reposdir=%s" %(oe.path.join(self.target_rootfs, "etc/yum.repos.d")), "--installroot=%s" % (self.target_rootfs), - "--setopt=logdir=%s" % (self.d.getVar('T')) + "--setopt=logdir=%s" % (self.d.getVar('T')), + "--setopt=optional_metadata_types=filelists", ] if hasattr(self, "rpm_repo_dir"): standard_dnf_args.append("--repofrompath=oe-repo,%s" % (self.rpm_repo_dir)) From patchwork Tue Aug 25 01:33:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96229 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 55854C61DBE for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12516.1787621620225866077 for ; Mon, 24 Aug 2026 18:33:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=kMfo0poG; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67P09qJL214504 for ; Mon, 24 Aug 2026 18:33:40 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=62IHnpQNRbx2sB4LCjcUhQw3CCtY6UzT63yjHpoCrD4=; b= kMfo0poGBnbRZL3Up4nKJKVmuvGJ8phl1Qz8iO09O+m2QTdP5M3jgmRVGhtxZzzS gF/jjIp9LJN8pziAOeECrvAsHSz20jet6xC4dDJQxC7SdIq1ONxDaeh0pS8oHFvO Oh1YhePQFnRDeFlyg3NeWVj5ACXuJEWgOl8RCByHKJzgHfPhC5CZi5pQjt/vJaNd 5lef3fKFHSIg1+E51GBQY0b04zld7iEoMr0EiDwqMauARtCQ+s6fZrPpHeWkirVQ t74a3wj567H0ZDOt7a01WtyWiiepgrhmfrbE8ph4mBgvHCNGEVleBCWtMxKseO20 iy4AsqYhWBmvc67s9T/bVA== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11022103.outbound.protection.outlook.com [40.107.209.103]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gkg11-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WQ305/lWlDJsg9h5ypXYehZmZhudXl60UObzxk+Mv0JXLuaEuKxmcUy35Qdk7GJPYDg8ZiEYhTlnLVfW4xMRrORB3H/Kybt101m3XDh4c2CfXU1SkhJM+kDsoatnw/axuWeaduK6qFzz6hnVl+8N/o8vr3NkV3kb5CJyP0gnV4cRtFNMj9T8rRRC2I1w+lsA+mB7nBoCXtY1u4gsvFHIJJr8wWzEgp9LSd8uq2qxBz+M5WoqtIQzwkRN3Ir73K/HlXuCCO29NRVY8gKDHiCsV73/09x534t/7QVcCSYOTJ04Nkgh/wRoE6WhOpA/hNNNCgPquvX1Zi2sdvxEuSmsCQ== 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=62IHnpQNRbx2sB4LCjcUhQw3CCtY6UzT63yjHpoCrD4=; b=PU+eMGEjUS6VX1jKcMNHi3mLTz18I81viSbKeAuvH53c8o5ge1LyDUiWyNb3V3ZLkYirSfVpMljPDrFiwy3+sXuES9WuqZknSN6+remvg4qcJlJQalXNbdnCtGDi7Mi/W0vhEbeWHp9JVPl/xkj3rQMtItqoXFORvI6kAQoMeIhoET8VtLQnI8e7uIn0Km6iCaNaUYJ6qTc4C7y0PwZKFz/phrluMGRtpYV+mjhFcIaOnI9xMV41POiaSanf2uHeE4OBiAthXctxeooxGBnPx7gF59/fp4pz/3sCQP9r3oDsxjoV3iI8+un/vEhZtoefS363DJreyg1BVKAfRHWdFA== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7719.namprd11.prod.outlook.com (2603:10b6:510:2b4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:37 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:37 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 13/14] package_rpm.bbclass: suppress RPM 6 fileattr dependency generators Date: Mon, 24 Aug 2026 18:33:11 -0700 Message-ID: <20260825013312.2695028-14-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7719:EE_ X-MS-Office365-Filtering-Correlation-Id: 45d0392a-bf60-4213-fad7-08df0248e2c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|23010399003|366016|11063799006|10067099003|56012099006|18002099003|22082099003|38350700014; X-Microsoft-Antispam-Message-Info: H2kZd8aS+MAq2znzf1VGcHEUMRkBcm6pp/3qDdIR2E8jU1Bq1RTrGvznmDFB1SQtcyP7zdnmFchfhQ/eoGbW+PrugV8jL22kjgjzDibD0kFdnb+g52YpXc0E88az559T20FdOSN3da6EJUyV4KdJPc/IBfLv2AeYIkBlbdv9qQHsPvmA9Mpi3XAJJKR1Scs1Rev7IjE4RGLb2THkyjqprD21i/BcQU96YVkcRHnRGzAIrbZqYP4ml6HRq3pdY34nFg8MqHY5Sw3LR4Xpe22t9g/2zKqPIGbz1g8uPZJvOkEH8JvzF1mJYwCkAJmIvBKHInuYPrcv7Lp/tjBhhSNbIhgOfi3gZFlrAIkkGk9vaRUCRh8LRTuL0R3WeNe8NAYBz2G32Fa3fRV4EgTTi0QSwbFV1oVlQ9kwEzVCksZ5CNZiuuIu7DCIwHbqkzQexLvOsNQk9JiVFRa/Uc4TbbstGiHBsWykl7gPEO8kToyQ3aK1rMQ6RlOMcgt32r9SGg5rBG7lHQWo1hBI3bDlJIoRH1YaDzWAcdUzmx2yubtoKeQ7mkKKyRJL59sdk9YaaGzCYHQDfIjkz8RRPou1kwpA3sPX++4iB9U9Iiw5onlaGhs99M/MMwA6yk0tTy4QNgcfIVe95UjWYmNCGqWzLv8kMfDlAFQqOqUHUz/kuJkFhGOMFqvHKnxJHlNM2cIBK6HMfhXn4QS4q3rgqeXNns2/hxHjyYCKqe7dpJ7s+txof4Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(23010399003)(366016)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cmF/V+IHshSKLAb6uIGC2iBYsv0vLPSSoToawRHVOWhXXMTPm990uG4gbdcRAQJfACjtyCPyUfXC01e239sCLbwu4H9aEykyGa0yDHeRjpDTtWB6EZ4fKDoCDRytaVpBiWskILa1ZYE1ITqD6IUYzBldlIBHgHyibkOTuNEGmHDT7tSuU1iRdCB9rXzteijrcyawc4pMTOag+NIjN8d7QKTD+t5+CfX3NS+5Som4lzgWxBZlOdtgcuHMPMHyxDzMhLtPJZHuxQGTH+3DPUeguMXJvI0/4JWLtlSVL1WQNHkabt54m0NChQt66VVBIIfWCYJgiisc6GVaHIv54LyjbZMLl1KwxyZ+TTQBD5pcgnV4BGpBZ56AflE0KNCukkmIIKxpIZfiBNXXW/1VnqKwkZ5damTqOauS6100wRiAdSZI/qa2ZcoKgniQkDmSGR2tv79WiDZa4BV9x6WjDsnfELEX4BgCpHlf07iPI71V0P5pRqK/NQui69nMV5WhzdmMo8zbDRORX9WCHv+oBMELZ4TW3sutG6PCvm3kA8M/HPQcRhsfckuvSf4PK80sOvkd6akwbkZiIsaVd7DiFtHyh+9rPDo6DswVNVOcU3yPfZRAEcYf1pOBDj/AY0J5K/u14bpOq5rW7erZRTMoveUJJA8iWMBZ8Ol9aLzQNruI9j6djIweKejevQkxr/SZVYX7eh1/MmJr9CrLRbvH/cctYkBW+iiWb115qpx/8lzq+3/IQC9yowj+UxhhAIUaiW3yhSVPhdVvPY61FoixwJliGIv+AlFIJGT0WgO2Qb6MhP/TM1cpwXVxSJCNzsI3ME56kRCOkjrRYPLINVchlKI+4/2NKgwMIzJ/0m2N26FMqLTe9gazo6nMz8rdf5ZLYqGV38CgJ4DDzz3TrFfSqJzdkdaUExtkpligrEaWc1ELIyqFUBNjFCFyBkzdMn8cbxf0YDLG9dVNewZQ/jjjF1AHo4iOPxSpZdEn6aCmd8vBmWU0BkXebibdpba3k4HOxCdAEJqRF20+PfkmLTJz+MWcLg559LW7yWeQ0k4NDQJ5A9wbA5+V9brphNFeTMpnVZl3vBzJMv7GWpomFBGlVuMVWebO6tKz3V3qzDcGpnCTMfiTyqlglQygGXHPmA+JTEqd1ovei52rgVlDYl5NS0xUlOPYSVdNnVOUwX3YSPMD7cONSbuUtT2RFlJql+cpVTNJvmqfEm3UPeDAPBh/cSFD5VdIYyJIsIQPDDVpNr1e4mw0eE6tyIH4TBuCMxYQBUuFSVIJOtZ08vqATjMgTnKAAxKY0BbVqbBx/IV9W1WUdlGW/npEHkrCkudnJdSQNgB7OsqCyvdvVLXqbNgRz7BBq22HEjqQPj/MvAvTggTms898SpF1fMf6rmUwsxk0+Ipu6DMl8yl3L+nk4Bp3ZTf2t1sQOSwiDvkgj5dBbsdg4HKxquFFjrN2XeN8n4RPK7KRq4knpXM4iq7rRaTUmqD2rn8yWEEK8FWJsXahB0v9nr/7pwZfi/Yao/ZAotp/yGPl714qDkQ7yk8uADc55i5Ex0JI5B29BE7TeLb+34TaD6x0SSuOBK+0drwh0skrKkbUuOBhg/Y0t7YKHb4d/DxOabR8t2JChEaaNJT4V14sh4/dsujSSEDZRDu1ydPLP6HOY8jyWErqIBozYs5eplXUz1DIaMsiQtyOrYUltTb9Az8ybphuUAHJ6gtBuZKXYTD6yRQhe+hwK2BpMWNq9jrvC3XywoNNLjS7R2RhzqR5YYk= X-Exchange-RoutingPolicyChecked: wfERO/g9/rEhxtw43MTamX8QmY3aWgThR8SL0ZV4Mg2wPFZji11aCsOxxsf5kcw+YfzocKfjXRt3CkAM5g0Epu3McmTH84nnlKfZ3kbi4KcIzOPxdXSWTV2lCIe6OGAZejj93x30T5xk8JEOR0SRgDxhgupCcGJzpIJdimEEOAbzWyM7nUJTe9+JyEm4LPDiemTqzDXGKqrhD7moVVdC4ACLxHw3vKP2Q5dOjQxhWNLW991l4mEfmLd7WvEkj9L0rA4GXjhPOCqEJBmzwlS6V5j9wsuZ8m2JYFlMhR9ppDzWTfj878gUM6gKvHZHsMk7ra8tiwDhqaWYP7SejhIRUA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45d0392a-bf60-4213-fad7-08df0248e2c8 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:37.6536 (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: O91Z6hQ3dDvX4oxeS3YS39gJuzlK3HVwLVR6Z4Gf9gVh2j307t/2yc1zyAJDXI87ujR0chPZghMj0LQHKY+GmDVBQGg53dq+9p/2uQGS73A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7719 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: 0chLOMneuByzYxGerN7dPejwNS85ia68 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX6DAymu+KJ2hF XFKaLoKe0efMFsia5z9GCWhj5N+Inxwf1WvUAW5toy7kH8JXuKbRXRAN6BXc2ckNAyvqbmbdalO VBHUj/NnxU/T9IXB8fWrIbCwBPJebZrEFb+fl21YRU5amZE5u6j1oKK0GxVCwHmFd5jXSYOyI7B /YxJvoOrVrT6bLorApI+4dIQLIA1dhRt4coJ62kpU/ULYtFYS4R0AWvTCWXFzi9xLl8VA1l5Sek UIGreYLJydJaAV4VWq4Pd8oDqU16Ud9H7W2ogO8lzfo4Uyz7N+UN7cbMpx1hIoi0NXwda12yJoC Frmuur/uo4CfePDMgjbiWaiBENIuw4L17XVOA0r/vD8iztZZ8jMD6IKRcgI+7jqujyG2wP7vBKn HxSP1HXqXjCs6G1d2cJdoKzjaQwsi3bLYYunwKgKaT/SU7Q0c5BCxXlgBZ5QwNQ69qxwEpQP96q oV9wKHbRa0/bf6DBmXA== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8cf0f3 cx=c_pps a=xj9m5St4rme5bLz9Jope3A==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=t7CeM3EgAAAA:8 a=bFbyjWf9jMRZ4lLZV1MA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: JoKNrck4ICz3osxs8XNgLk6Ik49Juj2j X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfXzXE5Ol1eQptu K/a+P92ftZLQ42mA3ktSoPJajTjeN/MOg0yodRE1HcnatVzw4Li1XQvFBnYYraTW0hKw9leZE6O 9ErLOFVnQ1awfwNUi7uICBmj+239dVz2lmPp5nVXBGj059z83qnE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244184 RPM 6 replaced the monolithic __find_requires/__find_provides scripts (RPM 4) with per-filetype fileattr dependency generators. Each file type now has its own macro pair: __elf_requires / __elf_provides (ELF binaries) __script_requires (shell scripts) __pkgconfig_provides (pkg-config .pc files) __desktop_provides (freedesktop .desktop files) __debuginfo_provides (debuginfo packages) __metainfo_provides (AppStream metainfo) __ocaml_requires / __ocaml_provides (OCaml modules) __rpm_lua_provides (Lua RPM macros) __rpm_macro_provides (RPM macro files) __usergroup_provides (user/group entries) None of these are appropriate for cross-compiled embedded packages: - ELF deps are target-arch specific and would resolve against wrong sysroot libraries - pkg-config, OCaml, Lua and macro provides are host tooling concepts not applicable in an embedded rootfs - OE already handles its own dependency tracking via perfiledeps scripts Suppress all of them with %{nil} to restore the RPM 4 behaviour where OE's perfiledeps scripts have full control over what gets generated. Signed-off-by: Sumanth Gavini --- meta/classes-global/package_rpm.bbclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 1e016971f5..71d5c5dee3 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -600,6 +600,18 @@ python do_package_rpm () { cmd = cmd + " --define '_buildhost reproducible'" cmd = cmd + " --define '__font_provides %{nil}'" cmd = cmd + " --define '__pkgconfig_requires %{nil}'" + cmd = cmd + " --define '__elf_requires %{nil}'" + cmd = cmd + " --define '__elf_provides %{nil}'" + cmd = cmd + " --define '__script_requires %{nil}'" + cmd = cmd + " --define '__pkgconfig_provides %{nil}'" + cmd = cmd + " --define '__desktop_provides %{nil}'" + cmd = cmd + " --define '__debuginfo_provides %{nil}'" + cmd = cmd + " --define '__metainfo_provides %{nil}'" + cmd = cmd + " --define '__ocaml_requires %{nil}'" + cmd = cmd + " --define '__ocaml_provides %{nil}'" + cmd = cmd + " --define '__rpm_lua_provides %{nil}'" + cmd = cmd + " --define '__rpm_macro_provides %{nil}'" + cmd = cmd + " --define '__usergroup_provides %{nil}'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'" From patchwork Tue Aug 25 01:33:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96233 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 9CBB3C61DC6 for ; Tue, 25 Aug 2026 01:33:43 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.12517.1787621621543433854 for ; Mon, 24 Aug 2026 18:33:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=P7QlGqUr; 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=2697b458cb=sumanth.gavini@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67ONb09Q158523 for ; Mon, 24 Aug 2026 18:33:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to; s= PPS06212021; bh=Sx6BTDfcjeWeuuaGJCOtC8K59Z/lsdZ6zmvYIuQE6iI=; b= P7QlGqUr4odDpcvN6aVY9cIaT+X7AVZn0G2eGyrPC5ZCMcDLRvsCK/DZzwtHOO47 RqsTAp44xCHOt/I4jFRJ9ZuvI+WVzK7kS5LiXLQEbX3X3V8i2eVItPwFzMutu7Pq yEPrDLYSjdQ7vZpP2UEKWP6nyo+KdVUBq4gfIYkOYuRypRwWrS68p5WSkfPJYpoJ oD3CYhzU+icBO03GRYBN8iAsDR5487HdqYpwyOCC3LMVZs0tS1V1SVN2v6gsb1Re bZIZzSU8Se5wjqPpDVbLWFI0yWLNC0NqEAVFZIs8mIzbnJJsN1ddSg80Zzyb56YR 2SKfpRaZ+axZqRggKu8q+g== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11022107.outbound.protection.outlook.com [40.107.209.107]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gkg16-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 24 Aug 2026 18:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ob7WBIPQ2qnwQX7SQUS3Fm6OOeoJYKvDx8WSmWFpV1KyxSJIGsRulbg+49OkEhFJxDM3ZdVW6gB28sZCMuoDjzHYeu62c16xhKNzYIlrD29eoOPDY/uW7dQa9fECq4RIjDx0bMOEr0Iw5bCFrLHjWVjvY5ilU6ppwFaibFdzCekOKiCzE98pS5x7Wv2OIU397YfKWoj31C7NckrUnWb9ZhV5mR60timsgzIHMX2uaMt8ftHOpqkoveNW/VVgf3cxqIkYzZterljR3v+lTmnsHful5eMFGDJ+IbCdckPjHopjxuPcO+botLMWF0PMprNoOgS0YtNAGYnjqPSw8S4sVQ== 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=Sx6BTDfcjeWeuuaGJCOtC8K59Z/lsdZ6zmvYIuQE6iI=; b=d8c7QfJpRu1FlbgzLil00dY8/8Ikfmu1nocurSxSbr18MIS1PRY6ZoOqdIakRNMSHfnVMWt7m4VhsUX49bJe4rxOwefZ7YLtf1n4xmUzOH0Qo6rsEqTT31v+X9fSWRYna+BMl69mqvh/98XlJ9fhJFVq9MvtLMjye+X4aDqR3Slp2Rgen8tDpV1jbgDzkw/mAamoP/MStyIBcfraOJpVByc1t1bNraX+v6iKKy8OQkn9Eu1GajgYO7yyA9OHYdwcUevdpgXaUiLhCVtQzk/k9mi4iZ5AD2e0G2iY/COEe8lC5O29sGrqDhmY5rd1Tn+cHvQlUCXtzrdooMdTeO/snA== 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 IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7719.namprd11.prod.outlook.com (2603:10b6:510:2b4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.339.12; Tue, 25 Aug 2026 01:33:38 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0339.012; Tue, 25 Aug 2026 01:33:38 +0000 From: Sumanth Gavini To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, mathieu.dubois-briand@bootlin.com, mattware@cisco.com, esparlin@cisco.com, peter.marko@siemens.com, randy.macleod@windriver.com Subject: [PATCH v17 14/14] lib/oe/package_manager/rpm: handle RPM 6 non-zero exit on %post failure Date: Mon, 24 Aug 2026 18:33:12 -0700 Message-ID: <20260825013312.2695028-15-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260825013312.2695028-1-sumanth.gavini@windriver.com> References: <20260825013312.2695028-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: BY3PR05CA0023.namprd05.prod.outlook.com (2603:10b6:a03:254::28) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7719:EE_ X-MS-Office365-Filtering-Correlation-Id: c889c092-fb92-4ea5-ed72-08df0248e35f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|23010399003|366016|5023799004|11063799006|10067099003|6133799003|56012099006|18002099003|22082099003|3023799007|38350700014; X-Microsoft-Antispam-Message-Info: anJxLfiIg4XxDSit2NjMZdYue+r96j4mKG4ry1LhpPjK17e5b3MNd9Gcg6yF2q1KiEMWm23P8a6Iwrzc9RmIHiUbYoZCXV/w2bYua9maXDPJWF4Z/Pc/DHDZLG5bN9W3K4/1G5d4MjHSUcDxtFRwSC1p318PDfcHUQtZPpcukY9nM2V8BzTEkHWh32DHXT5b2cATFanc3s4zGlj/v6lMRsXI0ZoaU0H/HVGMnSfI/cV6dLWXK3G+CUJwVaehAf75Lf+zAFB4V1fF4kPsZhkTLU342kFPJRPUgmUKl6Ngd0nzwhZ2g5etpB/vn0h3tUHrtvVl2dtfQLEIFcwz/TRn9EzQsiOlHROtaA48D+s9ZLrYgn9ver3jtj6/qZduC/cPauvQJCnJIJbmJI1MEvjvQOGyhKf0U4bCw4IS1EWMTctrIAzN7cBUvK+gaK/ANWnyku/U3R/nGJFJIFZgl8bXiq03vShcYXBU+AGUnrps5R7Ej2Wgwal7pahY8fsf1ZSCwIIZ8BdUAnMGVmFx6JQpOuCwpTH1u2AQm884ue1ZMbgq9b6XFIUP9kAksoFUx8YjI5qpHa/V7sGQ/YG8DpPAOPdI1oHvvcPun7j81zrSVYeaYdfHZUJ+lZ60WnvFHTqJnlcPTXoUdZOP/pCrW6m7CJw3wfgsdcSYTfs1zu0++/BLzNVTu1txS5Ls89R0EQquQLF4DE2hz9FrJc3jUQCD5MANVxtYlvYr5aTnkg4O9cs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(23010399003)(366016)(5023799004)(11063799006)(10067099003)(6133799003)(56012099006)(18002099003)(22082099003)(3023799007)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S5L/+SqYw5+qd1zxh4jux+e0QsH/2oCgp0uznIxv7av2g9Fxf44oAkNKWF5ktk35BGtmWIDcAel4a7wY44SRFqx4n7Ins46LVodq586KqOoXd2oCT1l3N/ngmL3cv3BKFH4/JCSwix6S8haLrmzo9hy+bGWD4YPCVPFewHEUGm1kaNE003JuS4PzOQ/tudktGxATmtUPHVz1uKq5i0AEKi8FaQFvznIvcb8/jstZw3848PgoJKL4ZAqRfT3cR/hOy1GXYG+QdFOGpb8r1upmkZVlASYnTWvhuFoIKV21xCzmCBL6CaKCQv0gN60WP+qonyuo7ciCIHpQgi3OyroXj7rSrdRFtoxXvm5W3zcH4yeBj7bpq3AP4/yyT7WdjITBullYYR15nQ6+n02O89XlDv++XizXuAi5L+MAUSmZWYS21q2RZViR87r+SVkqaBpUs8iqe9+Pq7qbOrGUQdRHJisoxBFTeD8RVOTZ7RZMnbriOnGMhtVi7ZEsrF7UlacGW6U13ipFoL3LMQoFaGCmrvrQnrY1PlRbBlG6huFOKQqMZindMHocbb15TysO3esu4yCTzSm0s7x8bTaDREc32+/uBpUMi0OjcH6VwBHvVK1B5IrO0k/eZCPzQhNBo3pjH/7KVvO5IwXLeeDBdbkMSQ8UpURVgSVeEKrp+dtwFc1ektj9m1BLdDLIlM3tqpsqZB1hJf/bzwSPU/nYQpM2Ajizc304kwdoQtkvW3NozZRMuFOHwBpVVKmiQco3NXfmbea/sAHygx4Y35T4QS2ppkLhTcsH23wqVnqOIMH5VBQZo4oOFps+BP8F0z9bm6BfAeGAkODIfZuEDp1wW71l/erfP+b20/6c/T70+sWWBZ+eWcwyyU492xfC5WfgVKz0zuVQL7/UD30WoJd8U1OKzXdZfCG8zN8gjjBfAqCLsVpFvOzywzJlaEW7NRkd5WdV1w5EjTOfu7tEieMtk5fZmEVjBxXMT/O2g9+L2bQKx5jihKox0MMo4gDPtNBVtMH5hV/AomEh4dxYrqgU0lEPqy3MJvZVq/UaMddUq9yOZJT2McmxW6hmfhgglfT2M8ptHs8cq+OUc+cZ8Ert1567cDHTvZG3MPeCmN7dxWuVLnQCXWD0+em4AEm+FjUdSyGu4mn3brWAHSaE8hN9nNA2qMzsiuZoRKaLozwZ5WZHnP6ah55RfUEKIWzui23DKfy2enGeKWlTcGVWeJWzwZmVM1hDMJyM/wGp6/F66BzSqii8GD6k/8fMnK1ja8SgOB0vzfPEr2xQOmEsvmX8nXSnMBYZZWF37Qteh59GDYSdNLuwsgqckcewhHtJkUiN4XZfOhmpbKVOhgY7fFrAYDOemRI5449EGaudOwhqklq5Ve2S18qe0xY0EIXSFgbgpLzj8H8peK8RLe8R824HnVm+6jzgXQ/CpGpsoS2OTmfsC6FvKmdfUOvadWz2Lus8C10YmrAE9AC65T6k+DOLfgg14RmbuvgJijpt+ZTKQI8Ap49x6b1qjsjF3jpNSBcScVhd26Ot+rRO7n8ftByaxo86q59dbhX1lHpTDa8NwYy8osSGrQFYlOEq+9FXI4J5xx7UN257uS93/NDY1YwxeJq9FrwOoHhagt6ChqZDlzD3sYy4qxHzOog2PirIdQVsTFwD42xaDqMtc+Iopahuz8sfDVIdnid01KZ8fzn+mdNQmKSqBX6myVtUvyKR9ZRuMtNgaIRBfheubTfzOM8tV2vZFum7ndw1fOl/LHE6Pqt/Y9M= X-Exchange-RoutingPolicyChecked: g8jB9nF6eRwzQMB2GvQdcnyZgeHMT8blygkIHZ13SFIUR2eAI/sFIKI4jRAKTQ7di40jjAmYN7+d+vtSSB3eJVxzWgNIob6s864EWKtHYISC0QFTuqCW2Oa8KMyrIA3C39NENu53/XtgC0I68wzdIWJZWQxxvRNKFhNIouXseo9wCOqQTXVFUme0E8Qiqr/v7wtndU5ZWvzNESiBiklQMMD3p4FEfqGgLTgIQaQXqSll+S3OeDl5e43bOOIyivDDLaEg9bNPcB6MK32MJaBn2/lv1cmXqe5l0y+N6PrQ0w0/34SsSm5KvBJMmTPOfYBt/8RWiYL70puOPa6txMZsXw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c889c092-fb92-4ea5-ed72-08df0248e35f X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2026 01:33:38.7229 (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: Bnx9GpJRkh94KXV9jnTA+YRdxzSr/kG9hZvAPbM7JLffytDNI55MWpd/3QNv1keBriX9VZf3sHwOhlIwgiuF/90fN8hmquAn1GLGhagALk8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7719 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: UYCAUwd_RXVH-Js6gxBqhr7HGSUiHMpn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfXwDyyRtpVoG+A Gyak5sxfikjDEwpo+l620oADZhPfsqSpIjd12Fw6jaIp18EJgm6kwapzkyFpIzHfaWQamdwKdJt vRsMtaY2V2V41aU71IdVEWHdbxybj8lJF1nvMylouoXiy7dVTMJJ10kHKDtZDyn/VYgBPGtDoFq CyOBa1Gt2BOwQD8Ucd6b8/qRK8ncyB60bxmMZsyc52pJGAFVLCM0dJ8R9yBroXt72sDvzy3T+YZ 6lBls0slnxy+nKLsgws5Tmr1UlqI7KA89OhIya4Jn7WRl+C2RVmVZ5x1Avxj+4cb8YzTHABEDHf 2clzfOK1jDK1yB3QfUwRhAa5OBzAiwxX9JlFoitafmlces9n6S+PQUyIT9EkXwE/KbOWNOEi74G REPYytsQsp30wG9HMt0FvkMiiaplXJmYL/sUOvDYpEjAJGAG1UVVWiZC4DRxBpbez8zXweNVQcl s0lcK+oQtJOkbDlNXJQ== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8cf0f4 cx=c_pps a=eTkUf83celiOrjwTarmvrA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=xrz2xm_XJy7u4lCe5tcA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: m7k3IDfQ3HteGt192mSYi9pieUA3n1sV X-Proofpoint-Spam-Info: AW1haW4tMjYwODI1MDAxMSBTYWx0ZWRfX8aLUH7zcaM2L Kh7mHnOhhoHYFdWC/bctCzvHl9/m+D+ViFehKipxPEHnQp9SqJj49cstNikmMe8fmG2F7XRmphG 3dG9rXxaZGYfkbHDS1TUhLp2V7bX9f0U/UY0ENbcvl6aRFFlhEZz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-24_07,2026-08-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608250011 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Aug 2026 01:33:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244186 RPM 6.0 intentionally changed rpmtsRun() to return -1 whenever any scriptlet fails, even non-critical ones like %post where warn_only=True (upstream RPM PR#3819, lib/transaction.cc). Root cause - two changes in RPM 6 lib/transaction.cc vs RPM 4: 1. New field set before warn_only resets rc (transaction.cc:1754): ts->scriptError = 1; 2. Final exit now ORs in the new flag (transaction.cc:1910): RPM 4: rc = nfailed ? -1 : 0; RPM 6: rc = (nfailed || ts->scriptError) ? -1 : 0; Call chain for a failing %post in RPM 4 (exits 0): runScript() warn_only=1 -> rc reset to RPMRC_OK psm.c:896 if (rc) break -> NOT taken, install continues rpmte.c:823 if (failed) -> NOT taken, rpmteMarkFailed() skipped transaction.c:1652 if (failed) -> NOT taken, nfailed stays 0 transaction.c:1896 rc = nfailed ? -1 : 0 -> rc=0 Python ts.run() returns None -> DNF exits 0 Call chain for a failing %post in RPM 6 (exits 1): runScript() ts->scriptError=1, then rc reset to RPMRC_OK psm.c:896 if (rc) break -> NOT taken (rc still 0) rpmte.c:823 if (failed) -> NOT taken (same as RPM 4) transaction.cc:1652 if (failed) -> NOT taken, nfailed stays 0 transaction.cc:1910 rc = (nfailed || ts->scriptError) ? -1 : 0 -> rc=-1 Python ts.run() returns [] -> DNF raises "Could not run transaction." -> DNF exits 1 In both RPM versions, RPMCALLBACK_SCRIPT_ERROR fires and DNF's _scriptError() (dnf/yum/rpmtrans.py:407-418) prints: "Error in POSTIN scriptlet in rpm package " OE's install_pkgs() already scans for this line and calls failed_postinsts_abort() (package_manager/rpm/__init__.py:210-219). With RPM 4 this path is always reached because DNF exits 0. With RPM 6 the CalledProcessError raised by DNF's non-zero exit intercepts execution in _invoke_dnf() before the scan runs. DNF 4 (lib/dnf/base.py:1146-1158) was never updated for this RPM 6 behaviour. When ts.run() returns [] with no failed elements it unconditionally raises "Could not run transaction." - the comment at base.py:1147 still describes RPM 4 semantics where this case meant a global error such as a transaction lock failure. There is an open DNF5 issue (#2507) but no fix in DNF 4. Fix: detect "Error in POSTIN scriptlet in rpm package" in the DNF output inside _invoke_dnf()'s CalledProcessError handler and return the output instead of calling bb.fatal(), allowing install_pkgs()'s existing scriptlet scan to run as it did with RPM 4. Tested with oe-selftest runtime_test.Postinst.test_failing_postinst: rpm 4.20.x: PASSED - DNF exits 0, scan path exercised as expected rpm 6.0.x without fix: FAILED - CalledProcessError before scan reached rpm 6.0.x with fix: PASSED - scan path restored, bb.fatal() fires References: https://github.com/rpm-software-management/rpm/pull/3819 Signed-off-by: Sumanth Gavini --- meta/lib/oe/package_manager/rpm/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py index cd6efe3d3b..ccb4316bd0 100644 --- a/meta/lib/oe/package_manager/rpm/__init__.py +++ b/meta/lib/oe/package_manager/rpm/__init__.py @@ -333,6 +333,13 @@ class RpmPM(PackageManager): except subprocess.CalledProcessError as e: if print_output: e_output = e.output.decode("utf-8") + # RPM 6 fails the entire transaction when a %post scriptlet + # fails, causing dnf to exit non-zero. Let install_pkgs handle + # scriptlet failures via its existing "Error in POSTIN scriptlet" + # scanning rather than treating this as a fatal dnf invocation error. + if "Error in POSTIN scriptlet in rpm package" in e_output: + bb.note(e_output) + return e_output extra_info = "" if "install" in dnf_args: if "Error: Unable to find a match:" in e_output: