From patchwork Wed Aug 26 21:45:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96507 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 00DACC61DD7 for ; Wed, 26 Aug 2026 21:46:16 +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.23334.1787780765973560845 for ; Wed, 26 Aug 2026 14:46:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=Zyql8VPC; 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=2698f24599=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 67QKdIFE745864 for ; Wed, 26 Aug 2026 21:46:04 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=9fHc6cgZgRbhKyjY4NXr914NBxt6aPRaq7TIYGoB/pY=; b= Zyql8VPC8AEE8BUHvpCrW6ZHxsrbO1TGMuEeOIX2jlHoh40vxfS0MxkZpAqmBTKm O8zLSgRgTVy5DwE57LoVAb1HyFRJumaz29NMRYiLFzT4tab8zhCjVIa+qIJ2dx82 aNnPmiQw/xknALkF2GNyrHUqNv+mMNWN4H6yZ5X7qlRtJlYFoS1atIKae1JNdYg9 IYxJOu3MepLM/JiZeNm2BlP4Yucx3p6ZoLFJtEu23GD2Zv9NJn4yioj2PHKBqWRl +gdSjyifKs3SvoG9FLNCyWV29PaBdUH571tNzUp6JS5/Hv9n1ydnsN0wV3Ol1Dqx D2ar95AEbMfoM0lx3aAvGw== Received: from cy7pr03cu001.outbound.protection.outlook.com (mail-westcentralusazon11020100.outbound.protection.outlook.com [40.93.198.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7100qm09-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 21:46:04 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i0DiRKOoLJncOxKTwSenVW2pHAW7FdBw0rbPb5ahsIaWSKlEE17AkF3o/EGTeyFBz2JLy1uyslm5KoteYLbPZriBrIWwtaOah3kdu2sz+k8N6Z5J7J30/XKnb2v25DWEloJk+mIoNOtcKRiR18Ffd7nH1QvCt0WJKMhKFIzQDu8y1GSKuvBT7JgjljvPPgQfkTttRcKJ33byFPU/qYxbj8zQdW4vPM+JJcxDrW1BajQvX+97gcR4YIeeQTouGv/xc5EotqIF1NGT2wGBRswVA2ZAVUZMuD5SIh90QHdsbWWTdP2F9N+BXOhM3CKBFRBblMkCK3scXVHDKKrgE05QOQ== 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=Qf8DbTXbcwgZxSj1BramYRWpeqrQNyxsQBFSW42BIjRoRwUOCDCpgrUFLQJ0Ra9Jo3rHV0Bknhh8Tq8klKQWXAdTxXcGUuQbc74Xd0IXH0RJbw/aytHZEFk/8Q5aeBsrPtBBOrdXrmi0T4h6NWuuE6tFfWUiam6VA7Rp7tXRlG7mspVgVAUXaG1GUyVUYfrthNDOOYSa7nGRYdvzUTU1VM+8wGkhqx5/+wL3OYZ1lIRVBYuEt8n1mCK/5KymWJ/32sUwdLDpX/vS+f54GG33yZ6q9HXTBN70CuIvWytUScVSoG0HukRWcOHVew03c6rx+rAqZeat7OhjhEcPFX4KPA== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by SAWPR11MB9898.namprd11.prod.outlook.com (2603:10b6:806:54c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.10; Wed, 26 Aug 2026 21:46:01 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:01 +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 v18 01/16] package_rpm.bbclass: Drop external dependency generator to support rpm 6 Date: Wed, 26 Aug 2026 14:45:33 -0700 Message-ID: <20260826214548.3002838-2-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|SAWPR11MB9898:EE_ X-MS-Office365-Filtering-Correlation-Id: 81919ffa-a662-45aa-7b9a-08df03bb6bcc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|23010399003|56012099006|11063799006|10067099003|6133799003|38350700014|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: LOl5RPIMWBcgiHehcIl7oPdJaLa2uGL/TM/3jd8QI965ZXCOpVTT3ANaCPiwi0yM1gT9qbgWlzKEv+J6xVFiz1apf8EY0mS6yIKct/9ZY6//jKrMHSkQeG6ZL09ohbB9hdyryp/IvrhC+XUKjNkUG433ravn0QCaQ5gZIfnHzxRG0VClYmEHCOYoFElGiqvf3wINEk4ky3m1d9N1wXMfLw/n49Fvw/dYT1l1GkN7tBBO6euTQOpJlp5Z6VpDjbesXp1VogOBQwhIzh0owxQr4UhzPDZhfnzHNpCfa12qKbIkRVxgqzFmcPnZRqHnAFlQHG+MmY0QvlnjQykS47naWdjLl+DPPd51julWOHzZRM7y48fmrMBdg9xwL0Cibysa0eSTQFtLD2hdheM+BegZVWQjHPF0+bUqe3gKAarb4YQiJ39wtuL0xEzY281QyAqezJx1+0FPCZiH+STjGwBhrDhAy6P/MZ5qYCrjTx62nE1IV2MVMXZ8H4tz023tYsVI8PMxMkXejTXuj2BJ9svi2bm8HzUF/ytLAasZoKpw1/yWOo6CzBRS2J2avElFVOw6HzGAyjNSjH12Pi2LTy1gVo3/n5QHUMvIDToYuu0yvSvv36NlsBVWhxdpP36bbrnROYml5nSh8MslSmg/N8d0TwXbuIZLMupmm7UIO0wyoLQJOvW+gaCu81giZPXcRXD+7F30LMzmrxpiDUCV1A6JEGqiiTKUjV+mi+ve7BFvDuQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(23010399003)(56012099006)(11063799006)(10067099003)(6133799003)(38350700014)(18002099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hwMofioK8SKkGeE7JKxYXhVhXBqKJq5voKu4Lb49LoAVja+ZlA9z+l3Vges4t41LSe2rEVwU382s6jo8YiZi13J92e7v2RseYmGhMCI2es29Y6IKJezThSy3BQmsw8IpaxHgUwzcSuOaSl5Ulgf48bKpsicmc/I5vWJ5AYz+tNudv46zu7hisBf92jaDAM53xFCuuQXwb+GhPELEUUee5cYYpUPzdgf+g4Fu4Y4AK+u1zkKl7AXvIDudnQ/rDqJ5Xi9TtUkJ2skS8bXPJRANAPHkUgHt4adlFUqvFSIaZvSCWvY+TVfKwHC/3OphAtArBC+2j8wTvP0CKEAcMguNQJ13sXk2K/WAlqcfYatJJI4ff4ShXlBNd9HugYYIPIEp4w13LePbjRaIn2QpcwiBLUSZIPqL/R+kvEmN8NQnr0ff8qhBRkn49yfhwqSurtCT5x9y1ilNhSOPmlt4a+tIaH4svNdS8O6lPC7qrefUPLibAKTUFRBdc6v7CzZG1JyT5ZBz+KJAtz3hag5o5mi0/o8DaYVY3Lbooo7WWabB3/bp253ClCYwDFp5+3XqgDvU/AjWXbiQf40Wy5sbZSFTBtYiVrgqdf3sWQxRnC4keh4S/FvyVsKwitK886L8xc7BZ6LpH7tQ/AoHgUUojt6yhupDZwRA+/lVm0FHYpQcs7vliJfzu8aATciNIhNvejtGWXkpSphNJjyPRcfKDm6be9WHQG5HvfPWL/ChPp/FAhE60vF5FfHYIXRxLQkF+drobKEIstxJbgFwaS7nONltSbAjZDHsulAHrE5gK97snVX7L2HJOlyXdsHFVC2uR7Omo+mcI3iOzcHZZDhgaSgg/1WH/0m043r6INxjFMRDC93P4qPLtuWllYeY0+gY1RtycY05+iTo3Bc6r1CRoaYvjNAf6gNgAWMfXd9DpeEFLscuXfeSeRlJX4gAvGWJ63raBkLSfA6NWS4f3ktiBan+e/Y/3kr6GQddHG1fCO70qSzC8ISmExp51FbsdmEcF6SwVtHpe6CpxhcM6o2TqHvLIRa+rNjj3ZEHO1tvYrT34qHzrHLgtzn4EEQImp2CiSijgXU4PO9drihStBN1o8eHa/+9MQOz98zWaaRCqzyLsXSWZofDkT5+9NPj4OVfXubrgtTvarPV3KMx/DXSpYkltuq1dffPxTo3byXVqhz2dLLk4PeEEj5b82M4ynw0EECNaW636Ffgr4ZaQd/YPzCOWRscXH/11D9Vm69cxdKzQOxlCkT0/HallgFx8uaL5Ru8g5GXAc4bySbaJNbn48PI+mhmTqwZMVhgaUjkWVCbxIUdMQeOZ4APp92iMTvy/IFPXPxBIgCQMnEFXo94X3jdqUc8l77q60vlDJTcbM3BJ/oI6Zc0A9bUqDiU4+g0PN7v+n9Uh5OIVILoKZs9iQhuE4Vk+tgr2YgHSeG/KL3egWertOqKPYc9re2wmnHqMC2r9DBUg25BHWrEBf9Ccmp6ReUIJ/OspyaJNjKH2i5zQPmyDF9rSrnZL9YkWah6RGW5whPq+XQ4wWnAde0mgIFIWmWeaDOR4pP+FMSUM3dFUUvRqp7g7huvKgRJTxxRH2LYKNiyz9Ke3ARwYRAxOOLAkHvkYI+mMtz6Q9SS9RByLWkHItmTliBj+bH0FAK9OkCI9Ls+jCyxZ+Bye1PSV+AlqMMlk+rgs6AuvqrdWaJROzBNPGa6XulNLPWiW03X1nivEebwaAzZusmmcgWnlfOEBbvu9EC3CH3/YZwuum3ZvRg= X-Exchange-RoutingPolicyChecked: j7FjtCEs0ht40JkLJdNBZVtSMMwnHrZXRHvvpI2xvqoI8Ps8qn5pNGc65UubYJoU903WZuphfuqtL5Tx3JeNrowefRhKn1r1s/rYQd7H/knzAe6TALCW2M7YKOrLiqnx6jsraBOXp1C0ws6lGFrkhLUL44lMbbO/wSSCvABoJgCLk5cjTMhlPCu/Xh2tVLxwyd5NWiZqYAZ0wLvBdHP2pGz32xEWd8MaVGV82f1uFJAyPOq+DUvtY71axWRgCoZIVLbXBowu16FfEIVCFcoyUZDSXdxOD2HobknWA9y77f97GpgNRSwEb4wQPEJeDaMIjTd6awEdYjWJ1cGyhu6ZaQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81919ffa-a662-45aa-7b9a-08df03bb6bcc X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:01.3485 (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: 5rOhkJhpvI+YnD+1Hp+0qsLqn5lYAetko7bALG+m0/rWyyK5p9aQKrwVxrOYzl/yUEM2/2KmRGMfc1R8pi+K4P1744cgdPwIX17JKBTUigs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SAWPR11MB9898 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: UiHX8XCqEWFOzdK0WguZ1X_IY9TIDklJ X-Authority-Analysis: v=2.4 cv=UaJhjqSN c=1 sm=1 tr=0 ts=6a8f5e9c cx=c_pps a=rsLXg5VPEOJQy+C7BNxFIQ==: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=t7CeM3EgAAAA:8 a=gH8vcDOTmKDoYkm8A40A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: A7sUvjE9NpbqOxKII1cuVPaI74FxT43y X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX5LMsQkBODDfG yDhLFEleFMuXOAI/L2swLDnLuXCDSb69SbJDNyJLbGZnlTa1X90x0pAAK53wsEiG0tNl4SC1MLM iilCApjDOtYMYC5Z2rKKubSTmDl/SwXGUh523Xq3cQNC8t1JdJZj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX+TIExJF74dJC 98CaC0bk+brWPSjE/jvPzqAWFXExssP8l5TRtWrNOpo20PqUkT9IvI8t+6OMRGQ47gUx68hpduN qd+TubcRETid5eovPt/GLW4Eqj8/VQVfu6rnYdsbVXb1bbOw7yKAhElwAZ25sw+SqilP4+axE7h Upzzs9Um/sjwOmVxwNMv1FKguqzW3zqxgGcEZvQZ8H/QjWRgk6NpwRLHAGRWzDEBe5uzap+HWQa gDImcuBse9rJJHRv5qvR4NAMHnblnGww3AacpdCGiV4HzZdvSUSg9siRJw3Ignngm/FIOY8HUiw 3IStYH5VrP7mxiCOr6ZyA5B7obTHll5VdVNANIL/d00ouckh4nJLWxIEFzZlfGHTzhfXD5HnKJX /PblX7mMYteW5ocms2TQSsW1bivYvovYzMpnPrsIqzPk9Vsog9tWBfCyqBnl0LQR9MpVUr/0rJ2 QM16lJIXx+6VADe+IcQ== 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244419 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 Wed Aug 26 21:45:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96506 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 C74D1C61DD6 for ; Wed, 26 Aug 2026 21:46:15 +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.23517.1787780765653519667 for ; Wed, 26 Aug 2026 14:46:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=jdS0miR2; 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=2698f24599=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 67QKdIFD745864 for ; Wed, 26 Aug 2026 21:46:04 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=PMSnjZ0Om9lyxUFPVbIQJjkiscHUQYRXHfWjUy1dvfU=; b= jdS0miR2WFiAaEugE6WVoI9uFiE6NECgo8EMtkjYTkFCl2uxr+vo0QcvT1Yjjb1Z v9G78VDvZou3tun94bcvs+DJb9smxCjbCHDhRlsbJ5lLkq4Q4i4HCHC/75BTEYug T0Hge0j3WEw1FR3VDggFxTfWkHfA75LwIKK42AHf3vyGGsK9PzJNnBjUKPyKiA4Q MCsNl3r3F4547fm8Un//UTlgYqXpw+AJ/Xxj/ogm2b2k79PnhRG8pUI+Hd9yAWVg EbW948anZUwNSiW3VRpzEv1kEz9Kh9Vrkppew4deltw05kAfeAUFfMVYBLQQ+OHC N5RJOJFJRm7GzGJs4zIxqA== Received: from cy7pr03cu001.outbound.protection.outlook.com (mail-westcentralusazon11020100.outbound.protection.outlook.com [40.93.198.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7100qm09-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 21:46:04 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hyEeFl4RoG4n8/RipvIANyqE9L82SV48PAkK/28ga3wTgYUroWYIgLrq0HzD8zmMXPS3RhDHgMus++V0EuLTpX8570N4nPf7TeKonsLUB20eIL7Na1jfA9Uv7jYca2LAbzFiYBbYb2iG6D4Sn8cFiyjNZFaNaVmLb6c6bpjHB2x/6htzVz/f6+2UjUgjGIB70wvSAtMevz7KvzTw7nrSwkbGX8XjyffVIURXgpUwZmpPsh516qYR0Uz5i/nCd8Ew6fOmWMBOBU+vbxiRM/W/k1eayZHy//1Caguv5C3JlSgFoDnzumZS2Ph/1/DoepxyL4H6Og+Vw4JQqtViJ3Cbdw== 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=rIy+FmqSBYZHKBrwOXWq4WWCfcY5DtZGkFbWs+lm0oZjH0spWxT2DlfqAPVyiE6gSqQxx9tdYv+KtviHM7nW+DSsBW3ah9IM0cZv4WEO6upW8D3rKJHiQ9a6PQlhmzUXUmQirf65LmnJkoiMN13uNDO4rZ8Gwf4rjP8N2LcgymNQvwXTnT7jKEgVOciGDHUDXqgXxhBJEGiCGsWfXQmsMGiTt9qqm0oHG6OOwRzK2NtFZ0kd64K66BUcEELgg7cXy8eepD7KPy1SDNypEWYxcLDjmYD9MP+VnWXuk9i5eCBn46ZR6Dd/drg6tyw43NPp9jYgsMYbkPyeTFRJ7JAXOg== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by SAWPR11MB9898.namprd11.prod.outlook.com (2603:10b6:806:54c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.10; Wed, 26 Aug 2026 21:46:02 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:02 +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 v18 02/16] package_rpm.bbclass: Define _lib and _libdir for rpmbuild Date: Wed, 26 Aug 2026 14:45:34 -0700 Message-ID: <20260826214548.3002838-3-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|SAWPR11MB9898:EE_ X-MS-Office365-Filtering-Correlation-Id: a1e2a20a-33c7-46a0-505a-08df03bb6c3c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|23010399003|56012099006|11063799006|10067099003|38350700014|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: FJ3pUf8tquvcPOZemmdQlrvBlb9ft3OnM3wFk6X6K/twUJ9LuzaZzEOATAftcaQf/7lsX04g2XxhYEFTQZnokCXiLXajQzJuIJWoREcmqOAf0s2fnnzYaemMTYyc8ajSoRUr1UqbI3JS5U7xrcRFeaxWMvAjpzw37QgAV+jV0vD2iorV+94u572lIC8Tyzsn7oPScwbvASmuaGJvCHsKsRDPGsewA6lwn6/Wh+Qn+SfkYlQWV8qIuXC++MtM460q3I74AQUZOijPfVQQHVjXkBMr5qvMkOEyy5PKA2PDojuZwJZZ+S3VZJmNSFJJ4M7zFZK2oIZh7Fj+NKVtwQGIFQQSxlqSmupIGXPvNJEdXprCNW92Bcier//QtXOVPaIfYgbgyNcuBRFmCgEICpuziGNSjDeb1GFV1Avoefngvs9OFUKriqKsn38E2nwxTH9+5JuOULKAwYBIhOX7LRs/50gs0a0f8iW+HurLWSDxyts4yMhfTQjiwH+fNWKT45tosd3+G0G2H7GrQ4j7DGrOUE4tqA7iQ3WbU+kDx+Y4ADfqIvTeRHr5ksaZemZIxsp6rO1IY8nRF4cKkKOlkzh70PiZ24xnG/6/Wh+xpR3UdUF7Eb9lErkEhrxmZSbl8H6lw1JaPW94d2z3gcBPtjHlDsA9+G6SYzdqIfhJQqygFR3Y7fYu0q8kAKPygJ05cZwRXrENiYdppEQDnG9WXByFN+3/1JFkIKE2qXqjYfXrYK4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(23010399003)(56012099006)(11063799006)(10067099003)(38350700014)(18002099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WNqMqbjT2/m3M2Pv43xStrGr72hOEMxCSfZFQRBQaB83NnPob4G7EsN7dT1aLiPjfg1iLnRQDifvya1xlLyVhxPjKEvEVLgg33csmYbDpYQBQNVImM4o6eZ0jsdyUnP+mPsU8/znoPOUs/rkS7aZLHQI+9Ov/DwOnSXp4inRqsuERM9k/NSGsE64pAsAuV0I7pAV8Z8/H37zDz42pgJxGQP3PXDv2NV7zO4XpNUTlnutn4xOuqmarvlC7YEfwAO1zmqrs3yL3NGm6Mob3Jmb6eiFUnIQ2lIa1r7r9JF0vHLHkORscxaSmyMgOSvYx4TpD03XKR61HH+vE3ywsYd/B+vpXZy7Lp7/jCO3d5oCltbX4/L+IPIIeTFIK8M+GH0Ni5tqBU7wH8mAJIxea4GOnGmElxyoTJBX94mq/JdhrenaJ0WcHp25s8270lkcMOpFbxsO7KGFmVUnYk3yrrszUzdSIw5fbAdHs4pUdsCGDqSyGruT/kpYhTtQNxFHF2B+g6TZZPvRNHuYq8xk5/1pWfWJnQRr+3qwrsoThCjG62RTZS00lY2EO8mtSsykeZz7tBWxoMLRL60DRgvR0nkAj2uRB8fCju0wwkmAK4Hs2W2wNp6uKGgv6gIZVku/YKhk0eGLjtbdOTZp6GIOfDap73bL1VtZ5lqD75IZlvgxOfP1Lzx2zce4WVXqf/K96VWzvEWnpBBspkPUy7HXtdDI/STPYkEgdMEoRcjGRA7jp3xFBxXiqwIZFkCAqgGJIlioto3T0knFkthLumX+e4v/UhZ82rZmqw1ndA0mGdNdzKhaRrHafEfoFrWNCNjk65MxG2cRU9GOAxpUKdSPfLlPcPzB275PfrNLX0DpRNLp5BNBjlNn/E+73jAO9A3alvrxa6HLLtR06jD2IVxrycPtxrnG6WvoNjWL37tV7chdDB+6ELTzkrHHmi96scvi4qYSuFEYRPVssGAq74SLWRGTMu6du4hL/LdhwNAi1NPXzxBALAKgcsYnZKwmHUAmUAhjXTAKCqGR6Y5eejLRfjVzb6W7UiUS9h027bklSFcA5uovWlRRjTZZF/NeE890Hny0YoW6FQM3HVkDgNbBv2c0jcivapIQfE9Cb2s8uONtX4twXSOVSmIQGPemRJnrOGV7ElJ844VUUKlQEPQfWcLGVOh1kgOgG3PavU9dzcGpVmLz+4aF224+x1aAs7O4cvceAIUIvS7g0PnVyFk9TvY2dzK4eil0jeD5q5vuU0dmGmjeVeUPIG81vW4MOSfq1PBOwfsN7iC/NPedV2mtqPLXx1BImUzf2J0p9FlDIiPeVcI6UKE1cf57Iwbao1d486HaWbY4doKgMPgQCd3kYj0dej9gZoyWsVfUCslkQdcZ8gxKXC6R8FuIDE2SZ7NqlkyJW6kVOj7NcZD5Uq+U5SIS++lDbNODIYZakMracj+unaakWqK2Sc+y1oIut9jQDDyVvW4vSDg8DKUdlcVWVZ94VtlCXikxQeNSRWTQWKf6Y2FXuzY61V0AHNCnkowWTNTa3OeQ6GSe1zNWHT5BFevrcKrCyRFq95E0YTmHrPR2kNszmDbxifU4phG4YlyaeDjx3PIwrJQSkR/0Jk7rzOKSSsj2vg81QTu4yY1UoLsmVRROs+DZfy2eA7YQ7MmwYAC+TB8nJCi2r8bfytU5knubsycVsrsZSCFUB+nJ1m/DP1eF2Av++VrrGtucYOk7tf7N8kD9vOFdMTAHSCNyfhk3/9N012MeA8v2ZV8FHjX/otU= X-Exchange-RoutingPolicyChecked: iJK2mmMrQOEfs1IxRDohJzmhRNARbOTcxOLpd0x8ihMSJsamCxXAhEUEksYQfN1Amym4yZtqu36zl466h8KN0TJonKwXzBWLS64i3txf092yUrvz82P/EZi6X9ehJaCMhvRX0joinK0xqi8jvgnBjAWwaU4H+QfqKMIf91yW22yXhNZCEGuUzLIhpMkBZ3KEnVIkX0s1EzowH8kjNkJTgQoGVf8MicTxv+ntc6lNNkoWd9e5IoCTDhM8/hjeaaqJf4uquplK8olFajQPH0hjhxhqJGLU/UAa2tiJBgALh4bYsaWHSo/EV/ZxuiUQbID74oYsayysxodpdnF0L13bBg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1e2a20a-33c7-46a0-505a-08df03bb6c3c X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:02.0625 (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: +bDdWpWHzVvrkRwZvKA4DK/dlqzAbsvdMzAd31I2sqOY/V1to4QmI2nv29tSL9Lkbs03A+xT04oXVngZc1go+HbLVye7hmLOhswMoolquU8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SAWPR11MB9898 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: p_w3z9AU02Sma-RhTX9Pu35Z8GnqxwQA X-Authority-Analysis: v=2.4 cv=UaJhjqSN c=1 sm=1 tr=0 ts=6a8f5e9c cx=c_pps a=rsLXg5VPEOJQy+C7BNxFIQ==: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=t7CeM3EgAAAA:8 a=uhQZ5Q_QBcnTBNJc4ooA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: w7ZcCEF68VQ3-hl3XDcjipNFUzJENtgF X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfXxNiGOIehtb+8 PasN4Pd3OsUi8LgaLPairWtFw5rXIthcNN4hKTPn4pfICI39KS3LbQvkkQcIRCHt1pnPOifVwfN 2FNxi5/Fjjc90fWrD6/lwvlJ9jlZNHRqSLy1FZSFZ4OtX49c+MHe X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfXyoi+TrTcFJPc bW84f5ZrfepTJn1NJxCe8ly4qIrK1vW17yI9gqDe/1SF6bJv/DhPFUTYi7YtalH/yO//fQxaEFi DUy+2FkUj7Q+6qwDz7v/JoijTCxUv7G+nqtEt1orLt7YxybNhNiq8TqMbbn621f9kpepKYhJOi+ aZdUILQKNFIiBktQa9s50eHtIcElpsp+5XITHVXCWTG0SEOS0tNKim0t7+CuBGDbppVJUcRcQ0D V7YOmbleqhPQoWO/bd/A5xZVrZwIA+4ySG4wB2Qj+XLmBiBnSAAIjK7MsPkhbijabW71eRoPVoo FZYeChqpSmvd/EuBgyl17Bu6xM1krUAzCc5J5txgtl9JoZb2zEAkkkNXWXQu63iGFQAf3PXu5Xx L6YVNFP29ED2Q5XVNrUtKMyvaFpiuPvEAfbe42TLYOvODk7RK8SLd6aAfO75SFrth3TsgTjY6US EDRJW7CKY/qOA1b8tSA== 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244418 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 Wed Aug 26 21:45:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96511 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 C2B2AC61DDE for ; Wed, 26 Aug 2026 21:46:16 +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.23518.1787780766515854025 for ; Wed, 26 Aug 2026 14:46:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=ryZALJcs; 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=2698f24599=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 67QKlSVg679287 for ; Wed, 26 Aug 2026 14:46:06 -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= ryZALJcsfim36l6ROZkaElP9+6iPTsVo5dujl5QQmPpG/4AaZP5Mbt/U3swhxIaT 31x5rTXiceLdXx/uoMaiugGuRRBURfSlVlRMcDb30zYva31jF9eEkWkcuSnq/eBe Brn5MSpbd/uQDLiNzb6YWWuUfDbApi+MpAV1Jv7liE/C16pPaBQMQm4AWCo6DGVl hG3tM1IqI9K5FfUyekMx0TxC8K2cWpopKpbsqva6xqgIvv+mNyCQpHo+brqZLD2H ASiIhfjgXvmJh88Omel2DJtNmbfMYSLTiDvr2H+8XbTUU5mcPmGuq4q8p3CIHezo 5Rfp9RPZn6UvavbFyMiUMw== Received: from mw6pr02cu001.outbound.protection.outlook.com (mail-westus2azon11022093.outbound.protection.outlook.com [52.101.48.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gqa37-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AM3i+2GQLdv5n/xo5z4x3EV+5vMxbou9mQ+HPkVtvg+kRkfgXZdYoZekyYI+5HhmhmZGUYxJx1lhcF/GppiTgOkjoaoioXiTFob1UGaT2Y01R4Dn0+zrBaq35wjvDUrCgw4qdmQboEwpSt8c70Q4WerLhf1J6rZ9Xzj8dDod1JvDP8wYIbLNfa8IdPWB/SkCXQysqQ4za7MyrgBBNRMBD5SXriJCEOn0filFr8ZKogMO1pTnvyK2Bzq6/ktWkrk2i8xsCKRzmVVQJ7A4MkOewQG/tfQFFshFuXTPIO+VvauZri/LAbS9+3fd9iCyMxe3L0WRCg6/nwxWqLpAs++uYQ== 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=Z0s+GKNijOuIudjs0epK+T6ERqUfI1vDDtFUosLK0ifNUIQurr32Uvpr8bRNaZoIQntWg4QqXXIH/Bb9iRZhYoX+AHT+3DVQWgj3bOFsnydFVwM5JXb6fSw/NVn8vTXPa3N3QASeTw9Cs+HuRF5T4TPhgbVce1JHxczJC37Kg6X1GBSV8b0ue5srkl4EDqjm6Z/W7+XwhV8DakafwoZCZh4rEcY5RLBHOcM2L79UyOQiA6/vGoAzKe9yf9XAeoeojQjP9OpQwuOikGszvzxItU4DVHidp0khmtv65HCZYRq4QId3RZc335EG+4rFhMezSpmN9463aFJk2sZXgOby1g== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by SAWPR11MB9898.namprd11.prod.outlook.com (2603:10b6:806:54c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.10; Wed, 26 Aug 2026 21:46:02 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:02 +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 v18 03/16] lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or musl Date: Wed, 26 Aug 2026 14:45:35 -0700 Message-ID: <20260826214548.3002838-4-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|SAWPR11MB9898:EE_ X-MS-Office365-Filtering-Correlation-Id: 57090663-daa1-40b7-dcd1-08df03bb6c9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|23010399003|56012099006|11063799006|10067099003|6133799003|38350700014|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: uqJEJaqWvo6CCl98gF2a+LD3Zz25o77azdIYeDHUKQs4vyl75V7w6X4/m39NoLu3X4Mm1tXLlVwopesy+W7oxZijs8p1+lMXQIXZQclOleEB8z4BoTsdVOsQZi3W4ggS19qrCW8CRnPXqnJvCQplHTiOsyOqZcgsAhrqRib825vh1B9hewJj++PU9xcGDWHipLqRB6GSzfXvzrw+k1BCe7gP/3hVrQ2iPpeBjFbVx655c3mpW1+WMbWy037XNvSQu0uvXYH9pfGYlFYtaKJvlBCzn20K+OTizZ9W4hu8Pifyknh7efdVnC0wytvKVD1SaJo/ptxfM08JSYxY5658yXV021aVq0+nAp/rpR9Hb0HxlkiFgZLTpbqeqNtTedt05ZHt5cRzfIEyozVGmDcoW/x3CA+gxGWzFpP7FkU6zquvS4IYZkmBbAYOFDrH42rwwParImItKcYPD2On3qdBuP6h5asDkDIpZmz6znI8gonleE3vcTLEnfA09CERfjchfYhKlVQapBBacEilZOnoHcmGPvyubMHuqLc5V0W9kqoZm79ovZ1QzTSaVPiZ8k45aixGlE88OujkYAoY16GAGOsEEje0DK20c678O3+f/NdDrsu3P+LhksgIJ0A+LdjTXOXanlGpG9n1fWp7DydKQGHhtZZyvjXWe4LfquGUQ1hD7kkdOvmMhEJv6/sW5PiT2R82wcF3BwMpf41EDkGq6wqsEMwuBCvuPHk+7MXO8yI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(23010399003)(56012099006)(11063799006)(10067099003)(6133799003)(38350700014)(18002099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 020V5E6LAX0L5kaZTMLO3NYZe9xqNPqwzZRIBygFl8qlX5G27crKNxNBmBDBcCkrtyUSrMLhCJJbP/Pe3RvLed3Esu4VDX3UsV8+C+v3FKvcRwpzwccoJePLSlx/8OtluL7Y+jFHEx9P3IBKlOlpvB9ecATD7Fb7mIF90Oi4AZjasz660T4GYcinIdPbrJh7XY7+UZ7rZ7hAjzDhpGMCdGMFwgXe3b0yq47bNVwpsVdbxe7MwalrRkXt0QJ/Q9anWad2+25L6MDabxHen8KeRZxydOpv1HK0A5mVEbl4qEpYGBnadHx+XSrLo2KXGiDEXroqMD9MZwXmgCcaHJ91isA1v2zHqLAeVqUlEvT1lb0zX2Jj6ImBhV/SYANdDjncTD8gWidNrAJmMTNJd7SvEWxNxGCBdaaLUf4udVXkqbBt6FzRWo+FjiQPKWN/A56xne6AbG8UN2LMbp44uoGJ1ohxUAXehc1dCIWV8JO6MWADBc9T2v7qsSqaff6AoZ4n0oumKcmWaAueLzOCpRY5cpi7QoIl4ZUAzNV4eJYQqayje38hS/AR75p9wJynwuuw41vuzXfVS1AIBqyCUGcSJsSafbVEU7x7ulx3J2LtDExHBXersKJKUb4BfEEnpgNPWZ783W4kLx55t4GEKH92GMSNu+Afa5GFZ1qDTibQfO+qI13nX2Gf3CZ3SUVZrx2YKUO7bIXytS4UjBWQgbP6fAFSd9xz6xbjt5iwiohWMbXhkajVnW1p4ExYqhVLFWrUwKk4njGm5ZoJBvg0OAvoO9efo9d1Y3yO2SzRlUvuGZXgyv2adCAqkow4OrlL57GwcdJPsxiBFUo/CwX/BF5mehiNf6N9mFiMxG+1b0QjsOC1kjBGljr7NbMsZaZVYvlK/khMkyUTm8aAG96P6aNa2l6R/uu3Hr6oYOAmSFHhpBwGe4F0+ExrvLkMCB3ojv+beBkLd1apT4nm0L7C/iu4O+qzr5eQpEXO8TfrXl6IyMgdzGq1tk3OTjr5Rr1kdJOHxLJkdsbWiZsVnd9YeDeeH5nobA39bJPmWyixFTyKNUspCs247xM2aXKCJgCIQPFTvVq3UDYX542b8szaHaWBTYrL7kKd0Sj7hqPAlHgtODNHweVKlvIU1/8m7aw3FrW9mS0TxCr700tGnZFGEg45+jl1vQTquRBqOOh5QRFGNWz8/UlKZ30GAhowYmdoTCxOiJCb+C7Shp8Eyg+z+cWvVoGI/ufAdqzcVq+qvK5ERSsOV1Lf+GfLNDaw0wNxPHgrcHThm2XDc5lamFkaU7UpGXEZsnRyKmtmteit+ErzE3ithZJVOQBGRBLVHscEuG1z+oiAvuY6vbbQu56H0HiZlJ8iEFLO/GyluJFYYD1QEJNp6YsHKz0Po5eR83X1H/OzBdHSDA4hxKrH+7L9Aio4vloyDl04LlIBWgGvh154kv31wHUGWfMH7iPEXwYPiAQhdwdvo827CJ1s44qDgIfZs/G3tcY07GQO1njYbrL3GUgQ/GLB1K0YdYFo1eHEdhO6n32AyORLi1zpJoE80hT5erjkMddcYJsejBa6MEx50mhMFn0lpqKlO7lCVPI4YF1ztvq/mrpC2qVxjtfMr6crE9TartC1FaYdjr8rWvNAsL7NjpI56ecIkcC6Cxo2+icPeyWSwnV7acLGnUt7sY9ztKcgH6lm6nwL7ssPCZf/uTFtyKXr2+i6iXMPmC7D1OTlNWKjwA9sEkA5MO/RxrhFrFm+X7tvstdIOCw8Ss+2Y9U= X-Exchange-RoutingPolicyChecked: GURRPhMpRABvFeBXTZ5DaoIFQunOKKFrpeTeE8tW264gGZwMF/48mhmKSI0leHIkVH+rcJfp6blZ9o7Xu4ajymo1rVEfQa7zoBFmAz8XneBW2as6QLSwp4jvR8ML8oNBrTBLCK56pQqkcc1vjrzoIBSOSEAHGJm6Jwocrz838BWzguWjod9289b8cqJMb4iLGaEqIg0NDmPf4PH7nTfzodjGtRoSkP/rwemb2qeRCZjbknqMBbFaizWN7SQsbt8h6VT3Xg0/qHSV0uqw1s2qjvu7uz7NCOzWNxR8O6Zx5k9EYHIyHWFOyFikSHTm6CKh+E37CIDya6e05dUZy1L9+g== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57090663-daa1-40b7-dcd1-08df03bb6c9c X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:02.7492 (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: 18HHrhnTx2nBN3XPhLF2tfElC+xhk6jWN4iUxLNF7YGl3uKsONYpPxc13YPKfHHdh+x2AyJb3bOvxgaDtjRqMtYzYZl8KeXTINCJkiH4Kng= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SAWPR11MB9898 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: LFT0njuZKO_2gi9LazmQMqjzmeHSplN3 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX5QcGrxcbS1gC qSP7N9SgjFmVKDK4A7TqwTity4xUQ98r1q5ImKCZgy9uLX7S6CkcYoyhLW36l2WsuCNQ67JAZYa /pCQ04IQuKBIdSNEi9Vvu8tk8ybVBDAimyMMfYmvCSGh4Q0AfE7TuwyyCgkt5BqjA4l7XPunvcV mhY6kUNF1I6MrZD86tx2NojnZjXHa8H+NAsTdz7SZkHEMzIOIrsrDSMBpSxODYPo1ABrV+O/Lhq iVpoeAGfpJ47a4rx5FYUcbQeYzCOVZjo7cbQTx63S7wxw/rBOsn2XshT84gHc4sg4zwViMMURX4 fbpLDnxTFWKzyOkwwcXPZLAIGmDOaEaG77xL7vknRDb0ArCJQQEOE3xvo8tQcVOS6yPU7wB+dnx 1DbB40rBTUaT520yojYrweBQiXOrhIwWRU1wMZEUmqGrqzD0n0iglVUn5FWffLtnxZoI62Xe8Ps luLvljYUUpoCcwVKcdQ== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8f5e9d cx=c_pps a=9VIIl2UxNuoJMDRiX/J/iA==: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: cJ2DLGJv6Fw5dtq9sHvrh1cWYQpxziKq X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX8gT6M2hiX+VO Wco+sMKpovXBvRBANLDbwq1W5BMicVzLgqGjRNOUyUwRAHl4DwXA42fYMnhq+LRpH/gfhYC4CWB Mv1ndd03mbbSaB/Uo1hwp92HuAp7klhSeEx5IE0Q01RUZmZny/ZK 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244421 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 Wed Aug 26 21:45:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96509 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 9B021C61DDD for ; Wed, 26 Aug 2026 21:46:16 +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.23335.1787780766467885080 for ; Wed, 26 Aug 2026 14:46:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=YtdlksE/; 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=2698f24599=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 67QKef4k668705 for ; Wed, 26 Aug 2026 14:46:05 -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= YtdlksE/UCRFm+5av453gjc5HcP8Me2OZ7M0ExjWG6ut4mmXYs2qGdN+/9eC5Mxc gHaAWuiK0+U41KlAzl8Pav0KPXc6CFJxeSpIX6kWFs+E6yOS6FxUb0Wxq25kTRkW 5H/ypv9T27nsOJKyi2r+Ta8f5VvKsJApKcDl/L+kAzhwzj2fYtEX8f2B4OqzShWN zEDd04Iy/Lie1D4M6gwbP7pWteVQADH3jp41alR+PFpVG70qb6MeJkxkdCzAZEU4 bCpzLH2sJt4YtuSy5lFV8PESW5mJGGN8nFJYqqz3uLIXtQcK5XfB6kmo7qqjx/DQ bL+rlWaQnJQkg+mT0ZnI2w== Received: from mw6pr02cu001.outbound.protection.outlook.com (mail-westus2azon11022093.outbound.protection.outlook.com [52.101.48.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gqa37-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rPSH4XsfQk7sRBaC0vfkv5O/SIAsVnuomJqga+gjNO268F7Ojz9E2qUmV8LLe7PwwKuy+UfOWfJ8aS5nDrzV8SB5chH+pa9FY/O9l8QZlui1T+Z2NKy23LTvcouUHFpfBciP989ObciA4yYw9slyMqnGu/VfpbNt2XzI8znWGNYKac5YXT9ABKVE4inR2vKtrB67mQaTB8UaSeJRm4STJGv9llp7uOiH//k5EMkWko5obs6EKP7o5V1cceoP+MBQ7wk4qwg9d7G3RPCV+C0HXgqECw1wJLCKTbvVSzcZTIUnUsYjJ+Jnw1q0FThIn7V1oZQqURIfBJhJwJp+lb/sNw== 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=Yzk/NeIjIdabC2TJT2hy1UO1uKbIs2CRZsHqJis0l3P+vdtmApukAD6Ok7AIqnT+J9TseB6oqhSnxlJuWC76f0u4i3bA5+yBtIBhxxOGpW3Lx8RbpaQE5D8AMjLQhqliXivNSDkuNH9Za3XCgxeF4a1ZsI3l2eROFMbXLo+VXkWrlI4I4GNogcPaFyDL5IylmEz7wxHXWpe5ah6dVFtgDxAhsMIDj65lbBTsRGan5yfcU9E6bNpsuM7GhcfhtFTFfzISSaZTKwafClG+wc5/Roo57hrNbWn+lRGKMhTuo8tFqlH48QEBmMsCE2jRbDvCkJviRMYxsL56iZjfpit5xg== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by SAWPR11MB9898.namprd11.prod.outlook.com (2603:10b6:806:54c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.10; Wed, 26 Aug 2026 21:46:03 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:03 +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 v18 04/16] lib/oe/package.py: Don't redirect stderr Date: Wed, 26 Aug 2026 14:45:36 -0700 Message-ID: <20260826214548.3002838-5-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|SAWPR11MB9898:EE_ X-MS-Office365-Filtering-Correlation-Id: ed59f280-4b90-43b8-bc81-08df03bb6d07 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|23010399003|56012099006|11063799006|3023799007|10067099003|38350700014|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: Sd9mA4Ath3sWKmwyhm2BH3UBMdNC4GZrfeba8jqJSQPqEVwW9HggJ+LEsOE1OqysS8GHh36qRC0LTZJM0PNvdrsijKwwMaEybR11Nqfc2qdZd+nEjNxqRMqNQ7EA6GzkHG5+CpCBIjZa54Xqj2DNfBwDv1IT0BDmy402iUF63Yg/1lfbd1Gh89iUDakl0VzYnrQMuZYMa8miHB7GyzTGn3w5yeQv9KsRn3+Mjgzd66qSR4PpFgcrBRV6hThs4hje8UaWLSHypSBe5rMoDZvxaWqVOJaXIH1gA1dmVFJ9UP2ehFnHUsl8CD4/tBdrfZ2S6OmxCNlHlDZ0nkEKecwHwTfLeH8K3W4i2I+PCmTEnXnafZOr5RkMygKKwK8i4TXFvH4KCG0YpNEw7mheyJ/hAPydDycncg67TX7BdEjUOosHDKdKxLqA57SdHNR8B7CNTuMOiyJj1ina719eo6X81SKeFCLADfxAfkiZjvLoLQg++YQQpJJ8TcgQCjHFVwdSyxuz+Mo8oTFeP9RgDXFK3JAL8+s13UyoKUJXWy5liOv3P5XrLZJZ8eYSLMnJOE65XjDQo4B+VTTjhCbJq4iFOmnPD/Y+wDi6Z9XYvCYUE/DWP61oU/wqek6KaGStJLtgYsXvFvAT030U/Q1rU5/on8R80U8k05tqXTYcw50Zq6OrrnU8aMp0j0iab7gJZ3oowPKFCskmiSklwLqqk7Ho8WrhB9lV4muqLLfMWg5hsrs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(23010399003)(56012099006)(11063799006)(3023799007)(10067099003)(38350700014)(18002099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bk02TT3Ptj90oYNXV5XPet3nh22S9F9oC1QaWcyVlCRRHF8eoONRieq60CO30ttBNVUMP8AyipS6TU1ds3iqArLap7Acp29x2f9hOwn6hI9Mg1LzjdcuaJNe3rmAen8lqDBTDb+z8CD27iNKTRmnA+nj5fkD8Wy2j1m4KpZAg74FqQUynx3g9Ks51T2CyWZUG47WVDA8dQ80cqfjTAIfLr8yAxaGDtvIQNPoKH9pQkTZFkflJGOeQo/nZH9F/4YMzK0w4L3MobenMHqmub73+bDGPIOync/SntJMJzrYcF8sFyf439zcnJndZtb/Yf3XWZ/7CuJe020zB/a0Nr9CGP9DE+6sM2TR+lul4cPRXBCiMYaAJF1FZf2aee87fYt89fBptAcq4NlBmNW6hjM9W2WVYhXOeht+01DjX+LVm7CrPSuN6IKLd/7b2HuwaKWokfMzymXEkGObqDIKw6LyJP/1GRMEdvBRa6FBYz9PJiawT8Vdu6UiQIUT1UMbwATnzHEkyiFY/7I8BtZXQcCNS3VgoEeMV22Avcrlm7a2YjUOxMa0h6+Hevk0oNl0Qa4gIQ2hUVJYdv2eq7tOpO02qOE1udvrk/gqiRsaGZiwrIQH/e23AKNtLhHXNzslPcx0u2YKzzPItkxcCoLrCFL8Cp8ni6mqteEZDo31g5dSuYwCiRSVzE1Ywj/nKs/oC5t2zZXMMEJT5HliFsV5AAhgEFFho89BJrie42xnTnKvl5dRhKTV0TOYBEUBNV6LXv2rQZ7i/oungdBZ7m54V6AZqW44ZCTif9FbViAH4m4Qax7WotNWPIv2BmkZOOQ5HM9qPJ3c15xC5UN5GxdS59m1C9xeWSQZigCgfKvFONl8xw4A2phqclZyQKqrMQ4qHNz8+vB3ycwrK4Uo95XkCYJKUV6PrpnfiknDaFJ40PEsWH+uZncESZoON11uv7HDpEh+I6kHW1AYd9vIGmXZk4hiVkMayq/EYGB1kwa29GqFgR+dRsefSd4A9Pv9QRml1SVnZdlBKGeQgVzSzGV8AGL7EkOWKKG3+TxT+Hl6LWdYoE5NcD1+X8fmx/9uONNSnbY7nbSVyNq23DDByE0nt44kfyFHVwVHOIjnPbjUeDuKV7a3Ge1sFjIyL1bE+mc13bFGCANfgpG0VYG1hxwnizNfS4h9pC91p/2Z8gpuV/xdSoJuEdQ8NCJ+5Th5B1VtyLyHd4MVVsPxxaVi9sahBjIgM1dhOrWyVTVNyVatp/pBHGsOzqlo/7dQzrQsYhJhSf9fxEXau0jEx0rt7gdd4kE0L1uj9p11X61AXsUkfvZvFrxfCsTgQSb/dZLsneecX7YKKvTYmqNtNIQ3/HclzJReRDuIfgz+YaUyiUs15VZw7iK6ne4G8GJZvWcXOcQW+Mz0BTmOJYQGxs0NKluEdJk7ZFot91U9Mm8RCpYuBd6PO/DdnnuVUibADfutgCo3cEqjkHY33mLLXe4eKm12Np1EsuxGHd1Lwr3oiUcmWfBMyedsBcRq08oHW9/qllKc/zbweez5lm5R51cUpI5NL9JndhD2XYkwzAUylaraGzQKmstnwxos9o9fTxt9V0GKZXu0cJTJPEBUWf9X1EzCLOPKtW9n/iD8uHdMqUvl2jdGoil9/a7tzFP9ytxwxj2Yi2j34Bxd90jnPttSjLod+4TSyI9OL5FYPkqLryjJx538BsTAjz28JtIUGMFmC6ZTHQx7hsJVa4z/sifn3BT4tRTOTUO7NfyREB1KdwlG2C1FTKg= X-Exchange-RoutingPolicyChecked: R7e8tuLpkM1FH2438PAS2YCndj9t8Nr/aF8Ny7xcK7j0RXY+KMDeJiet4eWiPHtU3aeN16IcHHGk24YjocIqkdmfUOdrCb8+q9XLfbkeJmV7+1wjsd3pslqXWWXolZVWxYRQY0+bozHFTOwuM2JTq5VqillYUbQCLPhBv3WSwAYAdLNnWmRdYcFP8zM42hQVIph1YVSt7rGSKR3bg0D0sys4hRZNgSUK5SKBwzG9sD7/73AdeNJmZucb8zMAHDkW1qGWOSbeSEH0XYN4XGsZ2UEMakKnCJ1GAR3flsfp3xdxOWY2ra6l+SP/oMUkFvb+LX+QfqgvUa0XyFD2P2Rd1A== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed59f280-4b90-43b8-bc81-08df03bb6d07 X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:03.4708 (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: 0LVnL+e99dg6JaX+yfFQIULirjeEpZcq+8IYOIXkJpL+jp+QmGVYTqn+3Kz8aDQyu4Bmg7gA4EVhWPhhCRaXvnDAqjE67y1CDUbh8uk1oDk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SAWPR11MB9898 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: ua3T17uW3Uzie23yVmA_Rf12s43AKWB- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX+2Dl1WxBMHQS 7c+sInsT5jXsjn6gcQ3/wpJsWQyhptRG/ww+erLwh8LOQdPJgEKF9kk1mYbmBA6oEcPKW3ZCQo/ v5OvLE21kR8myTjEvuGWrF7BJKeNXSB1wonE5aqRyRDWleYnwlxWI74GmDdH70LFO+y3rZOzd55 2qNcwFawjxVnck8hYJCkI2JC3nfbqwLfbrC0Vr4FXbmFfzAswkBfuE+hrYoXkw1LBbIEvi0n7LN 3XozqW2+9pDiPjUP1bBmCAFza6riM85BMkytJI5VFqC/Ys34foquFHrswP7R2O4ItXJl8Me3OaG EdF1GEoEDZD3vaJjYxvJShq1uF+EsI7cQ+LuxMK6B5gyD6Ma7XXETHQBwSv6crP/yx+VwYEKJTU VM7mu5QlJTRcY4CJ4AGvhi4R1/pYNCCT0OhyTVK1F5ntiwVq/NovlkU2CcEfD3fus+KQ02tZVQm gq2xdpFnu/glHvLrP4A== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8f5e9d cx=c_pps a=9VIIl2UxNuoJMDRiX/J/iA==: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: 6QkbitnSIqj5-1ELH-8F6XcpmZEg5k-M X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX85OthpHiCJ36 gvbBuitznuNUu8TXzTMbqKs5UMNhHkPT67mp+PJye2cgRN8CAXBNWECkZMPVWfC4ka3ANivgrmt v7stX0BI4nRZwnkR9RniCejCB/79cH80rtLkj11o5uRdOqvS0MOO 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244420 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 Wed Aug 26 21:45:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96498 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 B27F6C61DBE for ; Wed, 26 Aug 2026 21:46:14 +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.23519.1787780766761487718 for ; Wed, 26 Aug 2026 14:46:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=QcY+l86I; 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=2698f24599=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 67QKe20v666570 for ; Wed, 26 Aug 2026 14:46:06 -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= QcY+l86IZPyoQHVl2MofdwjJnF6ikZYpd+ibj3pXjop8Yn38dNqSoAd5EPIszRe0 Fe1yRFXpeXfN7Hj4Y01nPc+1/ezZCoI18osnDbg7bljTL9D0Iwys8Mp0d/vypScI HRCb6p9ycYiTImj35RblcgmPqlJPIl31uIpICfxiMUvwTZ27XkE1bPic4GBL7VnS TORGycoDilTkS5X1vdofxyPoawOjSmi/J2S5fTvEIDMhe/jSFVFABJwL16Xbw/0n yj9WeT6R3mbFPSnRunexf9y56iyJA7ptPUTDpojqaM4px7fuphDMgQaDx2zbUtq7 A0zRJrXsTYDWmb2ZH/gELg== Received: from mw6pr02cu001.outbound.protection.outlook.com (mail-westus2azon11022093.outbound.protection.outlook.com [52.101.48.93]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7b9gqa37-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wXUjLTst6PyeXnxwHdHcyEPx8oG3uP6dJaqQvO2WC18dzZwV7QkXJ4644gsu1eLENFKDKf5UGU8QG+WwON2ub40GV6+1qwMBvChvvcv6iL7yTx4ulO1XKAGYASw4VNK1aUXelbEgMwVL/EVaLm8TbvGGJtYWCvRl1enY6zdes+/VeVLftub+X6b3X3RoSxB4pkxjyucuWYnY7DhDcB8U1/VinnSuUQCiblCITDf8lEHuYJrMzdLGSessqBFC2SRwLdWF+93DEP7jr0mGe46vtXF2BxXnNhm5Nnct8UNDHr6sBITLxyQK9RTzWG8DJ7XoVQVI0gL6O2bsLjSwQEybfA== 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=Lv69hLx7w0RgXkxgKHnFtcKkU5BRjVzyBb+0bCqJSJ+yV7qpQ2xTQxue46bxwBUe6OkThnFeQqmVGJnM6A0aZ0atB93sNvvp2tCCIPnXu4eYvgdXrVg7kGtq1oGeXhaV1x71qa/5Wt50OBln4FP5X1aIL8EEOt952T+YCyNodaT0w1As0FPt9Yr9Y0ZwwUa5f6h04UV0QDz59n8Pn110IGp1XUvbs8ZM6Xqzr0+8LZpS0m6b0oE05NGSsowNSAlZ6HzOzIJQqUUCo/McdhBi44ebCPRzKFE+TgTH0QzjJ16ZlmhxQoFcdZFa2MyEpx3/fgOSvVc39Gdpvb60S3R6Eg== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by SAWPR11MB9898.namprd11.prod.outlook.com (2603:10b6:806:54c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.10; Wed, 26 Aug 2026 21:46:04 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:04 +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 v18 05/16] target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES Date: Wed, 26 Aug 2026 14:45:37 -0700 Message-ID: <20260826214548.3002838-6-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|SAWPR11MB9898:EE_ X-MS-Office365-Filtering-Correlation-Id: aa2fff2a-c170-4ba0-6ca4-08df03bb6d75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|23010399003|56012099006|11063799006|10067099003|38350700014|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: Z4sLaVYUfsgEYkM31RP/bOpwVgER+6XOlaubhujMs8V1V797OHax2k7Js1NoYp7ViOIG3R5+NDyRzWjJ0nGOOhTLjs7B84GOaNgxTgs06CKan5IGnhJ0GXMiFccPdbPQymfHFj2QHkulAkmjXk4co8lSQJt2rDsSXcwEmdPR9qRxBtQXsbENfvzO3JN/JFJcNwPd8L7kVx1zxqQhMiqpXV8SwDlV6gmA8kQA7bsyXKigClcQVtQvx2jU3CR1yKusdYvB9tLRl5yCe6ByveeboETwG18kH6dL9wVrcIISPIHwiB0SC1jNAomUAyWO7mThadcYlpmQS64tv7pExt3vV05KqzNb8r7y40MytRSfdYZBKX1PdjNtXffmEqFqOeq3VOysX3PB7D2d/n7qb4n8qZo9HjBwH5tKJKK1U/4qqHKJXCIrYRViGwco2W84+oVC2aBAO0z6wtPJ7KR5nn7fgCBOAciQYKhjGXnNb7CKamhNKdmXUCb/eEv42o/oQiVsy2x3XWJ+VKONMdpYUV5vTsJyjpHo6NW3r7+/Nf4uTJzggSM3KvgAjIiApHKP2roLRcgaYsR5WWPV3cs7E8xV1t0x4KjWJsBgn7/IakWEDhVMsZuw9dhFN7KcdpPJTfAbWpSMqJX09CvonXOe0A8HuzKmUqWLGzI3ZgK1c/ZaIEEGynTP8MhyIq36qe0At1gR6np5iQFjYwM2okOsdnTX86UjB2IR1RgyTJppooAqr2Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(23010399003)(56012099006)(11063799006)(10067099003)(38350700014)(18002099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JFTPIWJ0YXqZX6LjyjHw5puWUxnvk63X6Zk6JQG35K5aiSl86znXB9t0zctb/T+39pB93CmGe2wbDc5CRTmyaQum0ZheWKH5AkeLLCJNDhv40JLi7mIFMOGhFimBA+RS/bZ0mmZGVyazpShl6LwwViYsdiKEqQ97Co2nzYPxp6p10GO+TUjZ6yf6L8SPc8VOifuYKBviGXUbLJ1wKtLn1kF/lJHDGSAq6skPFVBRDCXlJAZe84qbTN/tV6GzDbg192j36FBjWZlUkfeBV9LDNRwmc2HOIVlmodgJzxmjeYv86CbTnJ43IZ5Jmuer2RsV8I6k/fINSsBxF1kAK85yD+p0BllPuoI2d8MgojgS/E8ayXvNtsPbCbQw/HaHq7b3H3nN001WChtS8YFHCmogrXy1h2t5xVqG2w/GN1T1cJ011xF1yHGcf6pikp5MceBnmsRM8DEtCPkPO7I4tCt+Iv7T8uuGrocj9r1PCNyvALV2wZ7P9AvxTWD3so/XKIDpMWrtYx3uAfTMFUCfeGOqUJzKGfgWp3aKzGQhuDmRG4Fm5XdVqm3cKcEu1wX+lBkS/hEKDsqwwio5zWA0MrbjGUuxXsAqY/wv27JbfY45nWLi5JtK/aeHi+RHD/cyBKRHKSYL5WcrVIQJIJzTvg1tpJ6qKKX+qs30AzBDBsJ2/fPfJC9NtLI5hrexwp3+vPAUI3QXkfTINYJ+pQ4aSqSKO6x2LJ6znLJSQdWT4IBA9+PJR6e00BrtjGz3oRgsZVPFitusLiUu1Ns1rtHItJopGfVghvwPFV/nuT76diXY8l0Vlb3dxJ9hOu4nf0d6pixtIKo0v3h9H+whcKRGOyXRIi5kMYjNB/cokZvnEXyVAyKpJH6Mx9phkIP+/hVZv3N2t8VCiy/1CLCF5dhulwU4zSIeasmrzrBObG0SM4SbP7jhyKlbFU8LzHi/2OpE9mPpbmkOEPj9MpP2lHcvS+4XxVeuzcLzyflgOax0E8X/cg1oZcvF/l+gqmkiz+I1HD1yB8LsI5/KGfNXdORFPZl/oCBcpU4aVVu1/N3fZ8DRKDecEVBwK1+gNsrKSH/SUAZ84NQqk46tmWgBCEqwOJyDCYZAS3iUY+BfITKfQ42+Hzu48EIjUPX/tcTiX0JYtwYgyS2FkJIug7YtbqsCIC6kGa+TTWOfx6GSqBtLEcO2JjdAm6as2cWG08ana4XrP7tdwuvMnjIqbYuAoiw67+9Bnm04XfeNyPG5tIsaI2bVVP8OWCg0LxvmbpxR87yD+SGT2MFpjQFtYHfLQRt5x/GEpOI5CeDxUrvIU7e/IhMgd0asixgu4MxkhYV2q4GkXA4RS3BVi5mwZC25hotZj42pkJ5cDb34J/qUAvsHQiv/rilmw5Tg0LLhh9Hp+Ik2ZskHauKMdgDZi/QGy7cnqT8h/oZPdoBCj8b5Wmwx/62SKSAtTFSzBjGqKh+9EAgZ8OcjbzAYJUsjjjMH5pagOKzHtxx2qNY1gJ+GHvjGnj4r2AlrOpPcWIaf6yVtc9NrAgjBHEKK+ilCnL6qSPhqqZI614tszMyp2I3LHRA/IPEQAUvt9dijvu0Jq1ZN8485vRj8NoLQMoYurv6hlHluk+a12CLcQ4jX2omYfYStOvXcXmtoZwKymAA0r+5sPgpipxN7SC9rb2TB4MGEW4L7X5/J2/qMj3JuoUvnP3IXDBgTDJHQ/amxoPUI9A+gRGenuKdoNLHFTma2B0UQGiOLk9hQwNiQbjGvSCCBgWnc0XEVCzE= X-Exchange-RoutingPolicyChecked: BXHQYddvLx4jmf43ZGzpZjqMSFaSecTy2VHJoEf3qmMWqqMwuIkrTznKU1DJhr5mxMdoCfFGM3rXy6LagUv/W1FtVsY8LegIBpY5SmeYAcmjTN9qL43sQPBq6wm5mA4/I2JTUiXdYif/rES0hdC1jWEEJwYtOS88NR2xAsiSpUBIigME3KPNdAGiWB5nfReioqVreNXKuu4J4zy+ClO3+9X/bdOGNO+WWmYUO8RBBbDd1KumxlpilzvYmRtKAn3ILsSFp/vXp7hE6Fv6NaBeb3uvzAIa5fLcYikICj4mkiM8J3O0+29de2nRM2cV0k3g7QTYbJt8RMrYVHsG8SnW8Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa2fff2a-c170-4ba0-6ca4-08df03bb6d75 X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:04.1056 (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: nxbHi+bso0U29uwU+RAOMo45AY+afBfoCNX5QbE0rPcYh9HfZLWG++bA2eL9IHVyFfhY12+ZTVvAEY48tuYY0IQdjOiEiOjNUUEdLTsuAs4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SAWPR11MB9898 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: K020SGM9SsVXUlcYe_qPEhV7YZVTnue2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfXydV420UZcXtl GfbOH8PkB+4NGAN40flBQywtWVRJlzU+J3U06eh7qHC/iic3ciFyeYKoDUmknZfs+moP54v4BfA S+J5pg6pnlJHYn81jRrK6a7DxWPIyUSaKiVmiWE/E5YxK+6U+mJ83lesQVoJeQP32LZfdIAYHiK eDLbqOP9A8q/z6JV/OY9jGcE52LMGrU1v0g0GJFmviveekwg6Hh+QH1147teltqyGrKIEzgyqDm Z1ULHUjko7IvJIJFL+Hz2V/LRhi60sEdIlbPXct6hb2ReGEvAKfcAMTnmL4bpfA9OWuup8vg73W FNU4qpBu8MJJVcGQBSXBf9PrO7AGcUYmAOdobGZKZyz6LkKqyvoOQuUynBlyJ3mUWvGg+zj3Jkj PKEGipmuUwtg47Y+D7Wkb0AyQa/tNRuW6Cf+EDlaqGLr/vDYDrA3BJZt5CB308dT0Cyxjun1Oro 8V9G2AVD72/lqUpgiKQ== X-Authority-Analysis: v=2.4 cv=LtaiDHdc c=1 sm=1 tr=0 ts=6a8f5e9e cx=c_pps a=9VIIl2UxNuoJMDRiX/J/iA==: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: pETjXmlNky5DniQX3CRg1UpWONhzxuxE X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX9DekUr8B6VtT YwUpJBMCiHBxDZdNwEKRtttdf3kZwCzayzc0RH13d+SjCgRCio/8ZG0pN6vcM+l+CFXgR1Up9A5 0mjHyrMpoemMxOZppvRD0dahJ0r50HWVsVfFp1MCp31wpLLQ2g2H 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244422 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 Wed Aug 26 21:45:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96512 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 AC424C61DD4 for ; Wed, 26 Aug 2026 21:46:15 +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.23337.1787780769666322610 for ; Wed, 26 Aug 2026 14:46:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=IIiaQ46m; 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=2698f24599=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 67QKeaVR157126 for ; Wed, 26 Aug 2026 21:46:08 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= IIiaQ46mqvFd9m3uruVq1rExyepK5cw/9hhu8M68nqp17MAVrtyflKNYPYRINJVJ 8hIFIP0fmvtbDIueL/JuS/kRJY5jdZg7zmU0pD1vd36vumtpLesT5hfxMERyCmO2 Vsqf4zq8uaO+1rWmuAyqoeaq6/sZvK7Lv05o4Y0334omXkHf1wfrkGsuFMBb8a27 vxrWc3tUkGuUdvmy2y1+nzoVHJCFg8mI3yrGAcCtEgW3Vw69Q4BUYNlktqYujG6U 5aiJOv4HeCu8Nzcv8ayPwLx8BEFU4rr4zuu4Hs/XRkyF7FD1Ml+zoAaWtGWrI2EB b9jH50NRORYnvQjadlg+Dw== Received: from bl2pr02cu003.outbound.protection.outlook.com (mail-eastusazon11021122.outbound.protection.outlook.com [52.101.52.122]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6yfhw-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 21:46:08 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IjNzt7e96s2aadKA3BDIS9R5ZbLWqnMyrU305Z1QVjfogTJGcXlGFtOpYtit8oS8IbHGV96KzvRmb74PEgv4iySeQ55/HO4H8VSqoUFkd9694eiCQznadXKJ493mWV1BCKgd6JACgkNXRVP/tWkhFEmPMCfmaUX8otrqzs+QIKV5B0gCthjiDB+A8VBZ7g01ZnCecFNKXDNl4kxnbJ896kUuZcKxVjqIyeIsuJoTG+BYuNgNJt0NiApyTyiGjO3GesCaaLnlxwUpYuFF8uqiZpvEEZR2ZcstHXhiku8hbMXuZX5FccV8/DRUyQvnbfmcasO9W7sHA9gh0bS4/Xf2GQ== 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=w74gyoW7Qi9wTAC91BAevIQYMfZfIs1fRZkQpN2Zw0GD6+OgKYLwjwzbr53a+vygNhHFLoBxBN7xbZ8Ggc/Y1Bvges6TPdIYGgUHDHhrE160NOLPYt1hoJ+NdUULzdT85hYdM+z9l/84JJ3zR11AfJy3btApN1rwrVs0x9e9ZZqmyHkI0vriuVCfkYm4EPA7sYZ7L4Op2xyh4cgT4nO/BGYo+/Ozt6djqtsu7EI0/VgMF0SOD5owI5J72TLm9DRbvx6sdk6alaBYrMiAETZEPB0pTNoW9NeR3KPJeCmyavyTWS8E4Qz2rA13sQuCMrn5fcAATLB0GC5oEflmLb2s7w== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:05 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:04 +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 v18 06/16] rpm: 4.20.1 -> 6.0.2 Date: Wed, 26 Aug 2026 14:45:38 -0700 Message-ID: <20260826214548.3002838-7-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f64b9f2-b4e6-4bfe-c2c8-08df03bb6dd2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|13003099007|38350700014|6133799003|10067099003|56012099006|5023799004|11063799006|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: ArVYPRS0joAKr+tpSaWAw59r8t7cTLtbIVvC4OK/VXKpNvfL4RBb9XHudty2P4iA1bM7wqZm5M929M1Orv1j9jqp/VfThGIl9Klnw9YqFX5zkJex5W779Wycqzik6VuswXfbzO3aGoZQaNLcEvsj5xg8GN9VBazCC2cmU3DYcsT5OYDKKXTLB1HK0UlR3B4SHNwOY41B41eV+rVrpAlIGu2k7tt4RtyFcVMptAXhsLv03Cr9v56MXllhg/kKi1Y5San4SVGiWlRXqBwspzyo5G0Rr4VB70b5DYBftLD9qRY15jh/9pUKnnXzF9jyFjM+YI5tzrvSlXcuLbMmdKXH2FX3QYe40Now9NOwzE/I7EG4fcqCzO6sRt0lzuNy0KKVzljfVT2XkesmTM8f293m/cYtNJXBeYEXOkBdMtl/jAHpZBQ83CTmWjw+n29PtswLTvGxlBOm8JnaKTkZzCeHGbuDNEMIpa9ogMMqz17flzGm+qEyXNahLgt9sviJx9vg6aZiarvq+V4mR2XJjyvNdRgBz5V2FV6+h2+lho3vLqLqvLl9Apojs2BV/EyU71n7bdukhWNv3/WtM5gzr+aG/8IlqKvlft5I+VdvixkM8I16UgT9OlODnRILM7aPLA0d8cRVO3PDKM+ILZWNAjmmyQhQLB/EdzvmNpca7+KM8wY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(13003099007)(38350700014)(6133799003)(10067099003)(56012099006)(5023799004)(11063799006)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: frfvUDoMT+UwwJUAyRiCc58gDu+uWCTvofAKdurBfKBcLyDwnVlMY701P9IiZrzzazzRnsfzR0f4AdV+pOp1kKRsXmGBfLTaAnfYHjnde+lqnZelWspMny2JB044Jnp610FnY3Fm9ln9CdL5sakgGZkVCdOBui57XHo60YylbiZs5C9qY5aB2p3a6IwlbSLMo9x64AGXqotkO7dPiH7q+AW7DxssP781Of7Z8zsCcNofD8aI3ZA4iUCaZXM9qgBQCSAThYVORN3ZxrqRIZnccXuWW1mthdPjCrR5Ws+IYkVeZL/Eydoa5Z4ZzQn28fUjyPZYIhBe0By5IgXjYr/mZQc2eTjGToKnOpmbPEQ6BDiBtaGDnkuYo8D305oO6xE5tZn4vuN5ezDeAij1Jig+Bu9nfYnr6BTZEQugcdFE/x20y9ElfwU9eLeLqG+ICoQTIkJQsbeqYBUXESA5zYlsv1pCA+meCGwqJdN7ysaLul4/hvZYTVUSH4k+NBOovndQMwqEXAuwK4YzN8DJXO8YWBH9oU9OIz/zgY6MBVuLxueUcoa94Fj2Wl7benyjb++oCrv/SRB2GOEndvMh2Y3YG53z5M/wjixgnq8FM5uTmv8NJoyF2iHSHwjIV0ywXhar1eEJchKYUAwOx7lFRSzeHk+i8FZYJuUr6pmA7Kwot7N+YGwLeBhu4D+0YIIFUKn6YjiRFuGO+vfrwCg19A1LK6HurCvWnRoonv4NjcXRt7GjRBKK9s1uXsZdtC7MCcnmtNE9WarzOd/kw6IWk61Mc66+qUWRxqSnjtHFL7Q0g4Nh7U8JxyYdkkdO+ILb639UZq1ALBO3qEIDYu1vS8xonzDgf8HwCYu3+HXTWiW6oqRHbKwoFr0CXddW0KoDFtC/177TZ2wTPcPxhJkJoE7dJtRgaubJu8YZtFxY8ZFiaggcMSNG3ANv9yK42Y8GeGE5v5joOIGvh6O9SwbLDJHjlZYB4YBIMoQLfKc/DOgjqvuQpoMvsKKprMtiOezDVj9Ywe8gWH18dndMAbDAHG6UtQPRgNRZ4OMO3zpTVGfTcmbrEk7dt6qruKDrhLBrFiWLl6DCsANM0XuOFfyILRw9WMurp44WyduwLcnO65i4/5JakObvohiZjynbyK6XKZl876OugORmmX/Frv53k0gS4uYhzD4IFJDyFaOzfosyMv3Lu53wEqKMHLgKjiRAe0tioZdL1GZJJ7UIs3rzXFG34rMWorIhRYAURqcpSgE2NezX4osum7D6Nx0Vk/eex2TWXmn5IocdTk23rXmyv+YY4nspl5bnXq1c4FqvU4dJtk3iLCSvPJH76rUYR5iT2Al3vzZszb8WCxICCvyB5S60pcsb7+zxGRMRb9b+oKvD3hFWra3luhgG5rI/wWKXzQaTmvFqa6GkPXUFQQuGG/O52VAM8xa7Cg4W1u1cNSpiSbs8aResJOtwov7FDzvTlHp+DDHiGgpDejZxXDv/ZXB0LuOUBB7HGxYrc8yvHVtjAaIdXhT91XRdaz7CL33f4T6+tmeP8m/HX15d8KW/XbvfmKQ6px6AML9VlXGhftE4wx72xcDi0tNQ8yOnQzNlkRGjsA1ncPreJHIP8WhGmr3IkiY/jBvzRWmoW/IIlOcgmam6RXGABUx5PTzvUyOCNESdXP6KcdEcAfZ4I/SYi8+cEm0uj3tl9Mwm/An0fiFVDjTRgHw/MOaydCqAs/DjeDJzncxq7YETOhybCVeT0/o+MOkcQFwtxZ9EGFoC2i5E/A0= X-Exchange-RoutingPolicyChecked: R4VGBudZCT21whAja0uTr9KVGxBK3qTLTy6wzWc9T9PEalZEq0d/21sllpjeiI558a76NpSAzTdPlDYDqtjBtBwRzjz/kc5cC4GYmXisRQr6AI+3ncLrb+zWZ4/44pSqjrzNLnky0E47StfFvhZhYa0f9B1DCY3d3yRiK/dD7cSmXuRMvyiv2x208mcxesbFKJm/oY6muadSa9Btpq2xT0YoNAAQKkTRLll8BNCN33OFEMsMThKWOxsUbqlmQyJCkeq/AiCzI7mGWZ6DpZvca0yO3S6Z35sQJSXSCgXER/7R1pW/mycWADQqGWGzQuNVBVgNq1dG6rcjxsFi7RjSTA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f64b9f2-b4e6-4bfe-c2c8-08df03bb6dd2 X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:04.7320 (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: HYWUWDFZx/Zizn6zAQuWcRorKE66B62qnV7ygCC9PyreYhglcYhKKW8i8nXZKGx0kc5gHqk7csQwiwqvMDtVzaRlJceQnzTDImOAkO6SdZY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX/Ski40kJazIY nyHQSAXeG6gbKA2JJKqv90gyAt1AtyJ6jlaKLL9cwLX8ikflC3k9+3qHl7KI44IEJMxjTjq0251 nNqQIG97awuVcSO9LdB1Mv1P0UQgDGTp5MfJTYgurLeHm3DlhmCC X-Proofpoint-ORIG-GUID: 3ks9-Of4YBPm_Vp5-Tr4kOWX7br1i3Gw X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX1j+vxHrV4f/k bG9s3KYtTRgu7nzJEnHUal+qyBC82ZH9L0b17shQs2rW6sPsnykulXR12aikYIEX+ixQD47U9mp XPLXvMI2hFglxOLtyGw17izIoNilkWIj/BilG4+LC1ZpIWNaraXtuWLVr6vLVdz34TDUStRy2xL XddwzE5zMMu79IBBvPWpVIYCfxHtTM10OIebBZK3EhXPV1GEMdBH8g3rdt8LZcAHX+FUjcbvqXm G6LaYohqoJ4Ac0vipEaQ7UNMMgcYZItm2N1Bxw+0OPJQIwhrvucTlUUS22kUB91mZordLCLz50c QC3qhInOKXvOV0JH5BLR6lkY5QGUwR0RTFBEiYaDlCOwlNxDg/MJ8uQb9Sc+nGkfbLFzCIlP+DH pz2DBdKaXs0OEXP2LB2/a7459anCw4+wICqYaltO779y9+V9kqSKyQxQMwoKGMe59VC7wZVupDb JWASXcK7LjZbYrebiWQ== X-Proofpoint-GUID: -YBzXeOsHlVeXraErcISoV56rVCpLllE X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8f5ea0 cx=c_pps a=83jsKCSeZiZisq1MDa3xoA==: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=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-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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244424 * 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 Wed Aug 26 21:45:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96504 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 33AD2C61DD2 for ; Wed, 26 Aug 2026 21:46:15 +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.23520.1787780769345564692 for ; Wed, 26 Aug 2026 14:46:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=HVgRlRzt; 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=2698f24599=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 67QKeOA9155154 for ; Wed, 26 Aug 2026 21:46:08 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= HVgRlRztOg0HOov4SvPz0amQ5/M8H1DzY/ObhVk0AGjrBqJDiJV/7vsDuZexwos5 TFcKfg7ta7tnIeSdsowWRQF60jh6OOrXOikKoKm4/NmTxTnW6muBwDbFp1X1Oly6 rXO5r3lMaYZdISMYCPUiq9DPWSjuXmcsqmZT8lVqk9e7zDJ25eKncABNA6cQeG66 zlHLP2ZRoW2S4dy6tKfqqNH+wru4jC58hq3Mlm9CSie046aGd9IMUVo/gpawcZvQ 4o3ixzkEWDSvR9XbERSB2ut5GDl30eKFkTEYT/7/7M30++11+ylTb73bhF6p/w5+ Oxt/BYoiuDiYX6tEaktJog== Received: from bl2pr02cu003.outbound.protection.outlook.com (mail-eastusazon11021122.outbound.protection.outlook.com [52.101.52.122]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6yfhw-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 21:46:07 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y07FqNqxqAKj9691YvykmWzNs+j/n3NA3Ro4JDwPsZPvcKvlqvSR8Agd673ax/5XHpvO4Y2gJ9l3O8SIF2AOZBRG/nxRUDeCHnFhGRBSap6HVnY2xZsyBA5SC86btv4H/gwPR6cckNRSY4KRKH+d1WIgzyMwBVrpat9AgaM1451PRtMb6tAr4GG+Ta7g881EKJI1n3IB5mcG/8KH6IYqtez7Oz0ZN6pwJTbGbjvdwBzJTjbl2bN/wuUHtQPE+8uayIDq+RSRCD4MItxkxXWJVBI1KBMETAwmuZQlA0/kahg6zXYVRQlzIfh18WMMVlL/EhEN/b6pE3aQAZXm2eKCiA== 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=u89ljTXzSN5Kny/+7jL1ZcVw7es21B9jrE1l49qdwFnfHwovDgJ31A+QSFlMVTBSANn4Gpsm7VopA5J7nphuzV8pbucTy+jnDtnkvpSI6LjTvumIgutCp8joIZ62FQWfrv29Ua+xdO+bANCgnpzGIVsUbW+ypRQ3C+26HrIjPMuiQFNziNHra2NlkrFoGGfaGR0ymEb+RavY8SIZH+LIALdS8Ch1bF2yDwpF0gOTOva+y3WwKZYnZOai8YREE7TtkMaujij8ASM1IECCmvPDlSXR26Z4IpzEC1jRrefa86BmCJ9j2t9eVGb7qnTEVYEycUEv38OaAPXKWrAg85ItkA== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:05 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:05 +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 v18 07/16] libarchive: Make it work with rpm 6.0.2 Date: Wed, 26 Aug 2026 14:45:39 -0700 Message-ID: <20260826214548.3002838-8-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: f72cf411-ac36-482a-9573-08df03bb6e2d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|13003099007|38350700014|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003|12006099003; X-Microsoft-Antispam-Message-Info: sepICI1MbQ7Rr069mVEOnaNWhDAhtJ5deEb+Fq1QtGw8NZUJtWv2d6D02PKBKrtUU+KlcktEj45Qs+Hishh2AX0IP2trZkhXvTN5K01LS1zuvotqeBN/YOG5Zt1fM//CV431UD/UTyy27pknakjum4mPDaHDusemI6XXfAm1pCmNtXIZvJWMHVs0GwfjQxTd+S2FPTrB3F7ZVhZ7Mj8Ph6VgtGCnoRqwEa/fvvLIZqinCScF4J1bjkJFHoyhCY24vyaIRkiG8KOYAwtCTkWeH+wDzTTrEv5SWcKZN7VwUnO6Cp8xIt8r9R6/LeGOEOYqUUqxdcc2gnoH91A2b1ABxA1s0DFaCzLn5KjJTTHMo8EGxvxI+GK61lMIOfPntLab7hnv50CJmVQwtHJE2Xrsx1INmtR8FA9Bwhb9vU9KbXkoxjnZ2DXHAojRE9OMPX3oPt79+C+haDygQy7IRecGELBsKKlVfr8dIj6UG9U8Co37QN72IJptt+xKhx2tX4wlq8FRfHwajoPpYnpJiG6QGxRrAH0s01Ziw/FgZkzlGf06tlUK+S4LMg3wQ2EFPFwa5HCq3uY3hiYfzE4mFQJ2FyjLGFAfvRF+SXM1EaqViT5qSpQrGs74zsLDK+0aFsd76290B6XsIK4FN2pMJWeX3IkgaxKdg4zgUoUm3hoz3wo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(13003099007)(38350700014)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003)(12006099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Jf53ZW5srigqtFi4xx5+DgwFOyjLEc7KhS4uk3urP9uS/s8IumHplf4NwcrePz0iqBucb5UtZzZMHMvKfic4CjaaWjDwXGAl7PW5CTUt5AwU7ItVhiG14xxZdOZOJzAZwkcpVvLmEEsvUzmfgjgNYn+LRGzAQp8rnh7neA+gGrl+5cWeLnrwHKGymX7QBNOhhJXjgM1uD3h1X+iDQRAJP1rXSoYok93RLtjKDsJW6GOIe1MZzDTHwnRq0ze49xUBOqcxzuxOe7SISCi+dDM6bniobwxSlveN5pfYoixxJjdQYmwv+/DFBfejyWFPf5QGJJW4CYmKyPS6PaMkhSL04YcxiOeJ0gxFd4luAN028ojNor8QJFd5IGvywM1SLwSjs/pwSY+YF9oXkUvymtQg++kta44t9rmYke2BDU7a47I2uiOx7O3NnXZ5B7wBgghyDcwO30hvsqr6HK62TeZKHFkaRoHMXrm2DdFeS6Mm2hw8sQq2UoOYHjEvJca9rB4aw1YvogKjzLHOaUDmsv7OSn1FKkHQf7ZsdZx+DZJJFzb6uXqAYk6AKgCgw/OyerJXs+S4LNS+jXNnj0YpqzP4zPFH10p3G1UHgww61fPlL3B0jOtkVnsftGa3oQ2xTr9RjY1e0gWQlLmfuJ8R5FMjNmUZgwkoL+5OyWH+3Pep27Fur1VkCGbnDn6zSwoHkYUhKyyy5nEu1i6/4jh6pXinH0uFA/lomp9Ur6X6c7+JKWkDDaRCTF3p2R9ZdSPnOelAZZ0KS1PbDwIueQzbIJG+BYB6c1Yny7lWzwQUxOZ5MgM5CfGooYH/xpXfpQExabzaVK/jZfumesfxxkXbWcWfCSykZyAg5dvEi7hM45FhffcBfFkSn3r2LY7lCFagvrUpNZ2puVLkgKcrKWQFHpLtyazEy4S6pnTNa2sXIa6Z0H4nt+ECPBX8Vid/7Zd8eY3upAliknCx451rdxAcaW9jldDZ0zC2BoLDlXEsey3fdq+HaYyTtJAGNK/tlgSshBh7t/QaSus0AIr/Rlet6mRSWk9WpDVm/9mo5/tur5uIJmCISpbCoyavVP9wgTsIEI/Nk4W2qA0v8cZmYhs076fZ6fr8UMLNLQKrqwZ6BkcAMc7NunBYQ9HNqye5m6lo9oY7dSeUEChjdEJ/6MFLoi5JkAq3b8qJQ/0CDWL0ZAEHOmtz9ht7SGrAjZ6iWe2vNNy0ZbVh2P9aFUpseGjQaAqSBH8N2VBnyDg9/xeThpohON6BbKrWjETzokKV28SpP32uUqT/ZSgoMcsbn0RFP4NXl4o/9gGk4DaEpIZ+ga8O3rsJ0EzVNfcdLJa5rU9qcTD0iQ+1m6ren4BpQ6njfpp5t1MOoS1oGGES95GffbkNoNZAEXvCe3R37o5wB9B7/12uZkZqMBvEoIh6j3VsphP3MI//+3d5znvlfEbSVTB3hnnIEn9zypGIXlw/z5ciISnxZFtFKF+qAnFZvRA2CGIEI/tAdPPe1Nprk3oH5029htHDqBszBDoQ19gP+yGLei7kps6luYCoM0enNYeEc+VwCCexcAl6PxmJ1RYQRFF05V99nbtTBOagjPHABDApOzFa0CKCvVDfXwpav2ReRmLMP16hVj3RyPdsjKxPTkmKhSMAY9UJIfab1V+iXrFhPNJoJLpy37hMdYib+qfkzkpgFCy2AMGiT3x1VaQMwDG6L8e6jYZUk9ee7RwFpjeeg1lwq3IHL5DJRIe2bgkSjNDFhbD1Mgc5Vd0Gx9458b8dBJc= X-Exchange-RoutingPolicyChecked: 26nOo9euppM0P1j3jzr5u7rEviUmBQcozYM6tLofk4KCsU9vWzIHQIafwzWA7tbRa0FoSUZ2jvseO3SA25XaO+DABQ3K6vsBA6q+CJUXpmCu8NgQLubtjHuJIvyGDFsM8Jj5OZDBeIcydjt+FuGcmAWMv+OOGWYZZlR2Ud7PyEiqr0QpRTPZQESPzhveYD+ZoaQ4IwkM1p42kWn3vGDMsM03ojz2mY3U8IvaEG6za1Byav/bGfMht/EL61pYUbRTOEivOfxtGE+qFc7hlSHxUrF8QPj7+A0E8KdHD7DnfMrsYMpcPQXa7LoeocbXUlN9ghC51EDv81Zo7jhEoJFbOA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: f72cf411-ac36-482a-9573-08df03bb6e2d X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:05.3484 (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: aK+zXglePDXRO/8N6iIk05h+DRHZuAQpAOhbO+660Vrw/Xzre9iF2H+Ya/uq2bRirxzyd9WOBjMWlHOvXMof2bPiiXkgwRdNpEfEMGZYO5w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX35v4Ihj1DZax 6tQNKWwxZA19qKJoubJAwRr6BxrYP8xYrEqstXIufXS7f396kJPswdtwtRyZGUmGqiaLhLXBUc0 q3Oodko8WmxP7ubbdMOMgQaFwgrvP4d23tM6frv+b8tnKic6a8mR X-Proofpoint-ORIG-GUID: DjmAFZll1xI5iFAsbjjq6JaQgLapHln2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX8xqQsLY2JcML E/RgD4aw6vlNUrejDGBYPI94HTG20V/SUmA20rKgN6xKHD7y71W1FOmm2YVtGqna4zoY1ijNKBA 0+buIoRsglH9Cps8Z1+ciSOF3emd8obNiwh2UD8clogcG+Yz1dOPSUlvxwGaQNmlYoZLiM85arl ghneWxWDPZ1evKAVg9oMQgH/1WJLsi0nDua3PWXeaB/sjAyetleJakpGD59/HX0e9tXHVk3nfWP iuQqm6pvjU1zOBJ6VwfWGqPEK8mdHZW6/lIGsOr8q+WPprYSXUbJg3MnnEbUW0uafgmrLfeNsJz VLzLmoHzCdP6C9tKT9HCNp9YpayyWQnh0O/jbAPZoMHqnApBgN0Ro5Z1MfkRzw96Ztjm5YKQIzg tzvWK+5CEJITgGVjc9RamgafBoshFrlsP4xFurhHiy3h1ch5dkbT/n5+S/CBaqM7GkvqG7rjAQS WpTubjsx7221Qnv2B6Q== X-Proofpoint-GUID: X0lIgtp2MmjLwKkW_NnMeedD3kev6qgO X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8f5ea0 cx=c_pps a=83jsKCSeZiZisq1MDa3xoA==: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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244423 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 Wed Aug 26 21:45:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96505 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 9799CC61DD5 for ; Wed, 26 Aug 2026 21:46:15 +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.23521.1787780770119416450 for ; Wed, 26 Aug 2026 14:46:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=FNWLJ2bw; 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=2698f24599=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 67QKeb4O157156 for ; Wed, 26 Aug 2026 21:46:09 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= FNWLJ2bwOc1D1K8qG548HGtnwCz4LMZ0f/tvHl6JUrWVOgMShRsA3wKBhS/0N4LD 0m5mNYNS0KjP6lWi+uYrsIvsAN+tqxBugP7W+eTfEVM0/NNYaxtTdZoGeGRRqaWc LbiHQvuQFlqxdk32pZnFDT7yJF+ohMDHtAa9SRgK5jSwBy4URuM/OXW4DNj9YcGd Jaz+Zgxrgso6mSIBIqjkJhBbGTSVLuCAYxwTFhMv9JILHmEgOMlyZo6sXuDh9AN0 TNxqNIZtzAzGTFwh61vJrlikj3U7HsTmXznF/egOjSN6kwAjupnli9FGVXtCHqUm xXFVLtfD+PNTsw9cNT4qog== Received: from bl2pr02cu003.outbound.protection.outlook.com (mail-eastusazon11021122.outbound.protection.outlook.com [52.101.52.122]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6yfhw-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 21:46:08 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y9P14CYUuPMzx8FiTY2odD1ECf44VL/mSAQQVmTCA6dCwZ/YyNcwwVLV1aEjo6GSRGXj7VOnXrOX70385TmM3c2ZCrxAyayoQfy4XiZK+4jJsNgObnZiSHKSttJAAMO82e1IV9zzL1/lZzLmNKbpM6ZLIunq7JJ+gal30Z0BTp3t9V+nraBEyCyhwN+bzT58wP9I+cp6+HoSb1I5PlijHVzH+m432rMku/PK2JksO1/JyeKJrZe4Qtd7/nR3qUmfwM0nOZf0Sq1j1Ug3QNbUChMeZunP5pInuypam7fdzizQ9LTaXNkzL0BBKldTZP6eh8/OngePfabey6OdTFD7vw== 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=hlDlsAQTTGlXIhHzczdwVVZnSRcFk+0IjmCD701sBLwqntV/d9/9/i3e6aeuWVKjzmGqtzEzLFRBEWLVTi0mouq31Boh+ZRll/5bDz6OrlW/BDWrIlcFTMDv0a8Vc6dt7TQhF22f9ZFqdLGNeqrzspjGCIbX7G6MSKmrjFdkbfqeN1XzP3ARYhvMEXkvDMZ1Z0O69t4a4tdPu5gH6jB5hqe9SKZ9T4npiy+jSk83SM7uVYCWaLdxP5k6lBL/4bwL+LTdUbDcuMI4Ju3ST7Xyq5HL2tfuvP0BEDOShXP+kr0BX7h48GqchCNUlBIIEB3zu4IaRUx9f9B/bGJyZiUS2g== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:06 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:06 +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 v18 08/16] rpm: Fix pkgconfig() Provides missing in cross-built RPMs Date: Wed, 26 Aug 2026 14:45:40 -0700 Message-ID: <20260826214548.3002838-9-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 75c8f2d1-0cbc-4bc9-f676-08df03bb6e8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|6133799003|10067099003|56012099006|5023799004|11063799006|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: GPutgyeyyVoM6B7VDwrfXkD+t4vA6ugk7XSS+uzOo8Qf/xSEITwOdQNsyV4XW/KXn2dWeGv2BKPfbyEZOHDo8RAWTTaaWLjxk9cyiC69GCcz7NcJ0Y2EoknHTFySUW0PYdTvWtrtKSelOEIkvjlw2vWmsVo6woOzKfL4c5lp9JWgeyS9aJLWOS8c/fpSy6WGf6CL6ja+8FC9ZpZlPD+jf0Q+Z/ThrD2zCmWnp1djAFW3cFB+ghHiXbo2dM4fpOJNL8R4xW/ygKrdPMlRUYAgG42OqNIqoDBoW3N6SjG37sQrRJR19CGB/jUdfzOkreMQPqHoeJVfvTtC+I6QfKIkWvT320sSd9RB6TDfyD2Gcf3ngFr+dykkn02N+QszvULh6y9xn7qndYY/39OAfNbOS0GatSKIsjHPNQgmvL1JGPZvlOnb1yo7DTt9KBsMRI/L9YrJcqy8Cc1cXAGLaRSJ1oIfQ+fAX3jwyvLJ28dk4E/d4iIBPHIELgsn5mxNJa5R8vWWC0dYVffRR7MMTTu+SyuGnZJ0OXtGmwwcH77GEpBbfJXu22dZjtDVkIRVPrtV/Dhjvh8a/1syVk23pcqDKTj01D8nGS1D9ZYRc6lEwA5ztkdyI1N3BP/yTO/D5QUvOxK0j4h0xHKOY/AdjsORZSUkS27gAE5n5hODbuUFZtkvjNvGDCo/e71GXBhZKUXC/JRShx5wOS4THLRQcRtezCAaGa/whyBAijPXiQA3mlw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(6133799003)(10067099003)(56012099006)(5023799004)(11063799006)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nWgYxlK9JPypCOCE0vnfMk0yg5AgFLlSYGvKjHTjukuM0ctuq+oU+me+PYnyZBJ6zqcr4lk/rN+DjHz1v+cJR/GCrgm5XPgo1dKZFuZH+aw27cTIeCuAxPN14Y734qB4X7QEM3B6pnn7p7tAsjf+grpL0oJc7KfTFdUF1GHC2/bz7gA4AmnwyNgFcB6rybhdcrYgUvlnvg/xSU768dN9CO3kOc4yx+tZr/uoVsMYQr6Mgsv6ug8Xb+luV8RP9yfhF5Ad8x6LB2Z0/82Htjto+Bbllnl97wZ9PSZro97MT7VSDURJtZilsxAJejVMXk8rLkJ34NZewcqME5XbTZeVXVkG+1PsupfsOILem4InsxFau7/5a2oGyUz+VW84f5HcZeVSCic+pj6s8gnpVRQ1Z+gWsdFQ1tFAqXzkupS1N77/Z5MWiNsPjC2dxUu1TieWtqNQJ3wH/4VVdPBJa9ZGpGo111P2oTNvWdJrjMnkM8LSy4J6BLOj1KMY/YZA7YpcbMmNAxGRotwms73021qgWesE12PvRGYTg6SA2HOILJEl2ORsEKn9Qn5sqBETwMRs/S+zojOsAMJ8UKN2NDCF1x/5FzL5Rjd7BZX6tdaMAlom0JD2HN4PrtgmwC2tYlhwon/4dbNEbaaeFH8yf2e6nYIpoQsLPJqS7TeWz7CwDR0AQNmdF6cxVNsfKEQ8X2T3eRLWMzm8muW5O/uNYQvbmeN5oXWKWTgLfaevBFjlPPJR6B5AmEOU0LwUa8mlJxvN0ErubyxgNJkga12x7vcNeCmgDgvhi093M0Qy9eiIlECrVqVDXrAaIkQTAQWvIpTqvzBe5vTDPE0oyYIyST8PluHAU1EWK40koDNUtaNOV3aOfgy09KQSbP6r2QTOM7qRsWy8ycZsxADVO3UhaH4aNH7FAGQp/7sqRiur0mgRThkcFUVieB8vamOGBOZSuZnqyT6EfK7IMC7gIkCCTUB7BE2wBw6CCuKDUwJPtO6mZ5JSOKnb7x45cYZ91+lmSFmLYKUO+SCxiitx7oUEf/1QBZTh8WIRwOr1LfHUhLmpnWYz4uwH3bECYDX751oS4SrLdw/sgWdSRYDoeUq4a2fBSHKOZijuMKCd1ykQtca0ft9DPTqeMoyJlCbAYDrAWfQJEMb0L+8/XrDzMK6fGZJDm2vT3/XPCPhkFZSivYU0FXEShcFljGuGXSnPgWEm59TQCB29cDFPYefanEZBgdnRFnw/ZCVjx/VapQX60E/ELivh2ZdsoBNI8QDSSruXZcJW7u83B6VNhqxnscMrAS1d0I41FaMr2XZ+IU6swNCVSY52IsRRO2YvVwFIhxph/6yOWDmF06TD1NXdV5Y0AHfIrKuP/Ni9ycRjIPRSib/1nk9AaWtxVKv33U1P+J3tmaPTQljoTQgu8IHau3KuE+KxVPQOlA7zbO1wjR+v13OPtu6yVXaoUlz/aCVlqMBgMFt6an8NZ96pNaMnNbCGxG/DYZg53KvdqnS7lMiTF+79a/wrXN6Rfexhh0eBUTzb4YXxWK5YCUYUkJXzLlUhzCOU04Lob5rFuSUbmPxUQbWel8CF1fk9kK3syvZJhE9qAR0BuA8nCRHHrrtPtpBqDmYOxSodi6jEprPC05dEcuzQYtOS7IDHC9D/tyIavljdc0QIkZx+rVUcKgvMzXVaEuZx4lWljmPBbpJJqLwkrZ1P64eLQXoF0YEHeqaUd+utI9ka6Xoj9EwJNjQv8tLtcSdsWbT3V+FwsVJR+1fzk85ibaU= X-Exchange-RoutingPolicyChecked: YsA3rdBJmLcy7dlBu3xoUxMqTIrbdDjxGwpVgo5rWydST1PL0pegpx+95Navelm4vekAECtZ7rxw/JOrfXHjC+Mj72LQmgIdBgxC7nqJe5a/x4HJWZGwdOzaNVP5kIQhpjfg8ISLeUJB8tijsycB4FSE23g2CMLoNtxk6JOHM7EUkDFSRnjH3iPk/cm7EnZxV8img3Rl8S87AW/dgvyVDlz3aqhXG6I4wvxA1FDkj3rDZSk9OOTuNuntUXFgccBtvxLvCy66zSgECAWTZuKfNYs1B/KczWKwWRM6mbrCzgjryzcWq0e41qFSzP5eGDE3j/zbcqKz13y3fBzVSXYnjA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75c8f2d1-0cbc-4bc9-f676-08df03bb6e8d X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:05.9442 (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: DskHvgaod3rUM3wt1QH8WDGMSlwWfFW78rZdnHHPHLRHeDKCg5ZFmykxVcetJPBFryOb8saZgQFjit4p0l5+qfp8I7pUfd/bh6dMO61bbTI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX+4q6XXW5JO0o BO6Re+KAnPdKWgRSwiNDalsx37e1xmv3nKCJ4mitVBFCPcty81DENKGWse10o30ilmDpk536rTD IjoqNoEhGKuMj4i6s62yux6aICN+DLO+V9MLk5WKzc9DmARtqeKy X-Proofpoint-ORIG-GUID: P6gvBsGZfNKHFYvgy1-FZwGaxB1YCa2F X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX9hC5BPOCFR/f y0oSXuWBBozQiG2BTXmFGr2c20k0aXdRTVU8sZ9BvP9yaqQNDc584iXDcYBfyQiQxIbbLXGzW0y hvlTf13WryQwuQupJ/AknS1N1IdldjiYzeLTYjb5yox59n36CJHFpNcb98DqKn+HYtnj8cEIfyZ +Wd1tbU3TyZovVCzuMTADFngpMyz63pAadRnHDrXcjyc889UqnN6L1nvjSZKXCJrqjHOvUcfK75 AzcAzx2BiO9lN/3wZTRvcczGfg4IvXYxFe3Z2z5aY1dkFUeebkEqG3vEaHycooxIONXz60EmxTu cxBVXzwK1iktJEYBr7Pc6+cAF8dzefjpZhoENei3C5je8EUmNUkfm7/FP2TU4b480zvYadR4XCx GF/0OFEMe2dcRgGKKW9hpXLwHkW+1CqvYGBA2d49Xspz6wUGLhw1AtQkjHcglI+LEFqg3oputGN CYQox69e2OJ+6qyMwsw== X-Proofpoint-GUID: k_Ydw0lSKEqTl4To6lcND0sSe-OUwR1K X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8f5ea0 cx=c_pps a=83jsKCSeZiZisq1MDa3xoA==: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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244425 * 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 Wed Aug 26 21:45:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96513 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 E8226C61DDA for ; Wed, 26 Aug 2026 21:46:15 +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.23338.1787780770543119990 for ; Wed, 26 Aug 2026 14:46:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=ROo9T+IJ; 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=2698f24599=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 67QKeOAA155154 for ; Wed, 26 Aug 2026 21:46:09 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= ROo9T+IJ09f0Sypz3uGIBWOW0zJ6lot9IyEjN057OJILdNYz4raRYyBIVtbnI0DO XQYyxUDmgQkK53whv1UGNMeTrt2SPM5I1dGWfFvh4Z5ndFWAjYSfCiHpLpmC7MqE 0M1jRLT8X3Xj5SdO9AcvuTEF1ANjMKEzK/HIwMnmYZq01n7eEZa1WThQkEIJ5Sie lQLqQD0WmnxoGlTU/rmWbfe5vDgag3/PG4BmJFaAlmEZ3yZCK49t1jBWvkjV+MmE 31/BV6CzJ8b+JHaUDFmte30mpg8d2Wq9LqdEUQS+cl60/cHRJjHS046hJFtgVN2x msJH8Dnp5hRBDvkk4aZiSQ== Received: from bl2pr02cu003.outbound.protection.outlook.com (mail-eastusazon11021122.outbound.protection.outlook.com [52.101.52.122]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g72r6yfhw-4 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 21:46:08 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N+tcberfVLGBT5lNNS0WTmPWW5cZVA505qVcH0AReXyxaIuFFIeDrjcqbj+nKumTXqEIGO6/QITnU/2vEitBr/2J0f7zsSDKn6+uieNdnvAnBaDz97POvsqBwBXokcYM+XVl0y9lXAH00heLPcuwpwl2zu6Kydm0atpr6GTUIeXa8bvMCE+SnFpXMT5ofgd+dwAUKtdeH1XbI4iBWoSjTj1exTmewHjz1DhBLyPqGBdBsHm/5XKUNMkwmgOK1Lf01xuBt24h2qXB3fJiCbtoeFX8aoMKc9JL4V86/2s0iRrjGrr7XhDzyb2+FEVuNjx8jr6+BjkhMNjpPDhbFnvYxg== 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=QpTLVTYwuZe+4hEg86w+vjkCHpMXcVpOd+xGkKrKBa6HWrNBBJDt3B7nqjq7vZGCpPx4TbsxwdI6vlqjDpaTA5rmNMWOR6cp8PAKnlqm4ImHJgDqbyaVMYvHcqKhp4sAXHW5881gAAE+1ddD9AM+SxwuxmmCi4gyf92pnoc8ukb9UxUr0Cs1jL4Z/2gjZETvu4+3EMZeM81hK3BZfSzIcP7R59CQKhDeeIsrZWbIcGWoAG9z6pXDfbQXpNyOrIGusNkCKRIKSdEsBbifWLvDgY/hR1+Zbc5WqemGtvdfZxYaGqscDJ9+VWDnTGvfYLEVNzmfFlaCFwiGV1uwVY3eEw== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:06 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:06 +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 v18 09/16] libarchive: Add RPM format reader to support rpm 6 Date: Wed, 26 Aug 2026 14:45:41 -0700 Message-ID: <20260826214548.3002838-10-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fcd2476-91ad-44f7-612f-08df03bb6eee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|13003099007|38350700014|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003|29003799003|25016099003|12006099003; X-Microsoft-Antispam-Message-Info: kOFqeEL70202SwyCMWuc79a79WiQBzO/6vXl6ATZtlHs78e8np4aGHMYXfkSPkMyWCjy4hEFqPmLlZXk+Ew283hk8KpeGb1a6EseLHgxApYj6eam/uoKji/VJDYgh5LvS96rc+2/PnJo7iVBs0H0NUs8sczof2qnGGqPEbtnSppI9rfDs3ZV4I0AS8el0t3DpFXHYh2gYZ9ffQswC6YYAkmW/JMSq5gfoPYuDBFIn77tDg5frlb5TTlPfE6QIWjeltD/BewIa8dwjEDXvwW+Wi3EeN8eWiC/3ZGunsCngB97QmCnMoBsEVtYVUBhFNXN2VJS+sQvMBDeKLLdCVmXsdAFB1/X687GdlhzP2UZ3CZkE4DV69z/imEWfL/pWiVLoVMGi4zcaP3y+j5jLcD7g06V48mQq8QTkO7wksLax+fGsaYtxq1c4xoV1AdgipAmBtTvqy3/cAqQu75NJtXDeLR++2jRbdLlxusWvEfBLZWpOOUGUykn/0y3GHTazcCgoTuZz9JuZrKyeZciMGWR+4yfKU1czgCT2syU836i6WPAB1SeJhInK1Zvh8kwlfLLpJQy5TB2OjIRk6oqxoJx/0tfGaj53NC1QAorFzFZbE3WffQeeq/Sdvxueb6G2OnUtFkDc/W20jr/MGZS2Yxk/Q54xubx2jWhDye/72kuoJw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(13003099007)(38350700014)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003)(29003799003)(25016099003)(12006099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QVctNFSgVuj4MPCtXVO9i1ShbCS0pSt/f6lT3ghAkYNSCyMRFcrH7qLOcspbevA3YODssKFMCTxWHe6sR8249BS372HPw8uAa5g9243EFWwPrz0ZJySg+mPNUoAlxW6pWvmkxK8FmgFvpMtcf+sLKucPZ/4fOxm1hIuEJCpF+/ZkCoD68rERQOP/uJ11zdq7R/uMEJImXxqcvKBA/fuIF94QEX3dTDwV/2fDRbiHyisPb2eQGmCJhGTetYhRDAeOXRV6j689aLAIjR+TGpRVDE5n5TrExUVb9X2ux/LtknUtDNKjDDHwwxrVmKYOtOXHERUdfdsQAiDnjD8/dbzyte9ClzlcACVsKaQTfytdEPQX3INPBqL2gBWozZ1N1mzqjiv+isIMzvkWGVSEsRl5M6gT4yEJkc4FeUVK1vkCL2EEmK+dvlvmdWmRAzcz8qWcRozYL2iOwU8Zi9Z8uClBH61CT2Rkp+9ko6HTExmXwTzIQmQkS86UxEcL81SXC3WmNisZZgzalPGc1l5b1Vowt80oMFLoPCOKuy/bLQbo0XoRJ2fi9s705OFgU1JlCIkWM4yy1EXBxnxdKuX3JGVQ2r7f8YcGZc5EdQUqMADBZ947+HBfFynh08RFo29kOGag3MjbCZNrEyyl2XIHbBu8fbn9zuiSSqwsVGfCIrxFsY23jH7DDNqQYOYKxvy6CnGKcES7BedJIX8jt1dok+biP2Cjlss4RMAof8p6akjmaGrec1SctvTpq/m687txUPDxhvwNDmx1dNqPzdRJTIzdvY1GTqk4WCbHHa14+qUR23QtfmvbE0pWc6Zym/2/rRAwa8cvDJglpyqjU84gvTAujxCtJK09dGG7nAApogbiWu0Ffx9/YHXJPCko2ReZ9TIta9riYo87w6tAGNxS5i4w2e1W/VObx0Asw/ybhONpBXs14OnSWhZCkrZF6NW6ZgIuip4GyHnGbiIV7ZHLFLtykU0jpI28GLhUTmHmbw6jcHAjYEQONMKNbjWKtpNYXIZKDjBvgEb/A4KouNopOSpqlOZ7FIh6NX2LnNqQ1Rjtksnd8qDcC1YW7kQbhRIGmqp8+6xwF2ScTzjGFxleOy1+oGBynz8A24s4214InAN0xaxhg/ULSVj4f+NsQCsHF4EAZwmANIYUSaZuhzUqIkVS8i2by8BTbvcqXK6HXcWf7M5xOOTt7JpwmDVzOdXo0bAWTOWC044kPzrjTFpDwPz9fqdpfRvi1Zk/I+50dykqe7l7d3XqDhrvHiTkIEr8eP+9VDW3NxO11jt3F9TQvJQAtHJdo02iQ3tuM0UU1l/H+D2rsHq63ti5pgD1dTuAWkg6VEcuJQfpCCkk55ukDpYEXuu66mNczfMRaqOs3llkGoGUUVp/mo+IDD69ZG6neSi3t98aoJmvATvOJkjVc5tHwlN1jbkU5pl21y78vfzsxHJsLcxBKX5cVP5xf/ra/D15a35b/SPx35GLA3UbUj/CzNoUS4t8bR/4SsTBdzAT9Rvwyv1rv11VEYcKqcyRX5keW7hbcZWDhGXX89DOtltjfdl51gNKfHbqko2WpIZhMC5vkQDDElJ+N87gSzoKoA6oiurmu62tQXttxuzKWtiBh22D1YVgAhFEzABRGFxCx87c6SCt11QdHeW6oeAx8aT4UIG1N4nvCbguhVEEbBbkpN9gdgOwEj7Rim2tmiJdC8oeDqH5URBIVhVdsWKAhZvq7ol9mkZRCLIuor4p/W2eL4pPt61+Uu+dBmIk2NsCAlc= X-Exchange-RoutingPolicyChecked: B4Z/GkqBe3P5V739vRuA8a0r3hMgbH/+uEAijfbRGo5uS50PKb3GzXvAVLZJ/so6b+z1S2SRWa7g9fTYWaqp0PvlR3Kg5PuA/qSkESI0e7UVGBiJShcEUqRap4N4W80Yknl8TQ7jwFVbX/2croqhYoWJD8JuwqaKfzlIdZTTRzjUipBICKs+3cIHqx8CIOumRvO6QGlyNMsmUnYY4Qp3dLE55vtPEzkCRzvHcpAU+/QSPsBtEewrBLdKgaL3MdkK8JSmYKMnZ4pfkf+MPUT0z/cFt+SPp8Abbba6zRsU8T5BBLUZLgPUoeOcV1H2dJqQ2j1/xrePBq/leJmzCspcYw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fcd2476-91ad-44f7-612f-08df03bb6eee X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:06.6902 (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: xA4ClfVVHBk+OU+OGA+uZZ6yc5Ox9br607HJ6Vuug/Y20NpbWXQpVrmwNSer9+Rj34B0B8g+nZ+2DmpdbjnAwoBq+2fdm79dnJ57mZI4zqM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX7SPHmm16u9nB /p45EdSAcEH6o/gjZsMCIG00fYXqVp6XuU0ziRIVJDOqQ99tiSwvCeWaxnv83OuNKYiuwZN+4rV i9086+mwXp8Ly8IaIjYvGnncMxplKGL86a3V6ZyrFvhNf6b28uhL X-Proofpoint-ORIG-GUID: jiVHO7eG_EhUcuYAn6DbxP6O71aHgidq X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfXx9EFdcwdzQyK j6pM/lzyyL4WAZfznvtnV6+wR/1HcAcdcD4T2KI76wBSDtw9YBz90p9uOlqjMZNqKo7NQ4h5AKz caJFtypepXsjd+aheY2BnSDy54scxSz9bj7iXgRVHJjwNwUgloOWtt5jaiKpAvkqw7zBH+GJzDV 7k5WWJrLjvtOLjvgeLAO157EM0jdEvxqadS+o8hRaU0HPac1MOZBsDcuQ5Fso4Q19cICp8titnu 4m1nqXti1dRW6lKT377qU4J31/hPUFhO/hX8BYDF/43IdqjJ1dyN0XqpwajloTePn+zsjdbiyNM qrtsVuKkIWGmbUSaqIhBX5fr1AgDxsEc1BfuTMZVnJ+OnAUp5Bs5F0uiVBUAEXWIa5u6GlzjuW4 nZjwHuAThuOIOHqNaCecjTQiCbqDcq/C3wl4enWko4nesjoNZfT48+wL27g0ZQ4K31qYIT1a5jX hm/ya/jjyMNrsIbLGhg== X-Proofpoint-GUID: cIu28CJ2ojZy8CVCxD3m5tQvsHuGfwNG X-Authority-Analysis: v=2.4 cv=RLiD2Yi+ c=1 sm=1 tr=0 ts=6a8f5ea1 cx=c_pps a=83jsKCSeZiZisq1MDa3xoA==: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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244426 * 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 Wed Aug 26 21:45:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96508 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 47554C61DDB for ; Wed, 26 Aug 2026 21:46:16 +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.23339.1787780772290920740 for ; Wed, 26 Aug 2026 14:46:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=Ll/KlbVW; 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=2698f24599=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 67QKf6IY410014 for ; Wed, 26 Aug 2026 14:46:12 -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=rASnXtSv83tBeSpEEtw+PTCzpnjlKrEmJiMXe1tMPIg=; b= Ll/KlbVW4MeNbw0D4dE5ev18TFSgnLxGPTSCvTdz0hrQzNK8aOYdLQuFnTSWntQd xEPglMwmBe2nuCTZuM1CpxX4gdXKDtasRd+rxRfELyumcFYCOQKi+NM604nSjTRO HfSC06QCCYsBP98OukVM3/+2oe8IrzMIv8TSEXV9NfOVDrsgoIimb1BrnyoCBD8u xPoFAfO3n0CPeV0uQBoCZNGfjrJxwRwWv0H14FRuRkAWerSKXIuCZXvmw6womBHR Dfbo4vpVr8u8OnX6Xw7biEkmPJI/Mas6Vyw4LjzLSbpZ0m8kBIjhEHWlwDzqXzGB oj3ie+wQsmz9CQaRBWigWg== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721qf60-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RN8A2ybN+YnMgvQSS/J5IYlVaeTRQmn4WCMCTy6dBuRDu0kkDBkppiIjWj79IvTZBfjwmid2nit2TQWCX0rVrTWOKlILJfejiay7Fz7QtT+LwtEh3ekFj6JiNEfEizIqASWlt8OGsub7KLzVMc8M7gGrBqL/J0OtMJlYPz8M/RAnMzVODCWPhWM1oZeyqBDRzkvSeAN2eZ+JGxWaO+SwKACvTf482dDMeGF1huEAABbKh9C0SXjZtpqY/jhchHrgffV+S9I+qwJj5yYBpAxQub8ObQ/iSfdjLBuC7ZlI2Ldiw6+5i/YtzkNUEmF2otMxxk3j5KfqHTOn4dHqqYeQ/g== 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=rASnXtSv83tBeSpEEtw+PTCzpnjlKrEmJiMXe1tMPIg=; b=Xnx+wxbIedpfzb4TmwEraBoQRjILgSUY9bqkEvnKCsneHsizwNsHvvxL5y5ViBiVAKsz7Je9yCg7/JXVAqDRrIVKYxcmsnY7qF9/QW00+VQ/7XOgI+2bb4Q4fcefC2RIYNw4kVJJWfX1FAFr/Ho6w6Ky1bhAPi0JQ1vqektOuqSgLjrOGTFeZ7R7UI4pxLpQC3QoJRzN9gkFSsHVkluBwJXr21Si6WtLgTUuOeOiz5iIldFY4IUD5jfBbERMPyN1CEN6BaoPMS8S6h987+ojisvF48N4RGUUAQuw7dQXEiQLfPrABj5pCUgjjaRQELVReIN5YZztZvu7x6a6zGW5HA== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:07 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:07 +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 v18 10/16] pkgconf: add /usr/bin/pkg-config to RPROVIDES Date: Wed, 26 Aug 2026 14:45:42 -0700 Message-ID: <20260826214548.3002838-11-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 008cebf8-791b-43a4-02f1-08df03bb6f5c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: GSll6FoPXmyDSwTNiqxbVWnFKfeRC4wfa0B9sDLJ/JIz9vD+Vvfcx6uz0Vy6l7Rk0JihDQ2RnrKULKrlejdBv+jD2FN4xMOerVT53WYIoP1PGJ/Dsx+pt2i4YwCbmECgS2yFqFXugBKK38euhU0Z8HGah9VB0kpJKcM8IaL3Ka1dP/F60Vxco+rl5ogJgDbW4Q1StajpAak0UO7PDGL1dU2Sw4tU92J859z3yYt0KlZYw2fDJQIBvTWyFxmk4St9k84WzSma8uwikH+sKpCLFrnARq6ta8WYXEl4Jws9zr5IdpLBOpaL8wt0XNb/Jcu+9uG6q84WoaOc7JNQY7doNXrvPO9u5BFn6gDMDnjHG2ozPJJi2sS+EPSB0zsiJkbLvikJbh9ChNOdGPw+rLSFGHbC8sIivXyy9s4K4O9Gbr8ASyLzCywxPhCHt8OuTnL+I/DxbdDNjuw2tcJM/EYVdL9h8rRmi8rQvdNVDh/qElf+9mpIjM+HbPGUG/zGChuEb+5K87EsBUBb/sJ/d2y/Wpc44oJPOVw03nIWPEwkDadzPsnpE8NHNPaMoJ0ESRLaZXLwd3fgTBlfr9UeCwXCzzsW9kioLEhrJZ0g2ywMOEm7mKpdZkaR+58wa4zfFytl4EInA6av0YLQF8yykVLqiG19Kxy4Hovpn3L+4lhbcd8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2i0fcGEqLm+WRVhIvcHXuk+wgkn78IkbgMu0Bd6kq2Wr7rPNBaOKm5040p/DUvporVS5UeTsVWBHx36tVdqfLaPWSpP4UVgIMDN+V0Cdz/lZxvppiouhm9Uhqlpeay3/isQWZHBwSQrO793hzl8axd8uPVSAWYvLN7ilGYogYOiPpwBjrPrYSFGMwvQIeUeMKhOPB1Zl4MpflycNmYSRNovLwVqVEimsz8d92hVOtWHzxzz7x7cR4QrljYVZEw13WyS7XGWK4QLxk8tn6jjuw8ufGpYjbuxbWM/J9dr4lJCOzeJExsJaJEbv3ZiYBZo1qbjVOw6NLp/qWOmfyEiVdLHntWKpMgYAahZ+xzuTICatqRUCnkXaRdIKMiTc+N3Oa2SLUoimyIPh2+Krr+OkecU8fhp3147+nAfPHU/r/S2q/APZqYj1uj0RGVKp2utEa662vKN9g7+SSIpJKYoxC8TNj0CM2pG+luy32cfHSRo6MBPJ80NmhlpCFM6FwWItJMBgDw/JwEbw91cJu8cZQit+jxtbV5emVG8F8yYCZLPlV0wRwHycM3dgi/h+O+CVrr4RGVrCB4cLKaHwjXMMMCFWT0gMv0hrsLhFz5McDnjF+XJunh1OiP17FgNIuxatQktkMerGlVm2arw0N268FMild3klSixOKLTAmBOyzuPSslHQxzbHVBSYTu1gQMMTlFFOgnMixCB8mLXNxwVOu5YNYe7bMkClskjKeOiV2oQTvz48k9APP8vOv/0hn/VhMMJpuLc6WAwn41DDAug+/F9awCrO5HNpDTKheeShXzC9rIZsjV4goJsDuBh2e225H+H3shLel+/vvHQvPPnCTcXweJ2vvR8Zy3WTUrUPu7/svK3A5cUpINZ6tH6OR4z1FCECNgKFRuX6NvS4F9gri01WlA7SZtVW5U8r/cX0Z6ZEsFHAew4uQgAB6PWZ3LjjYC5Ml0OjCz9+luPF/0q3+XZyOQ3sGstkP5e0b8vMcZxLjb7bd4RcsJw/dc+i/zg8FtpF3plb0Q6JozKRrtDv18DHhnsZ2KfGVvzxOYZNQJNOV+1ebdpDFhpl0vWsUYNkzxTrRZTiJCwyH3dlBRcjn2lugc94j5rtkTfysMS8JPCGP28k5/Uh/uqPuAe2IWeTHwJPP9VlzEZlEse/1sOFqFU7wkYjLaXTn5Hj3CQ7nPHcNIRDbLwCbjITc1vsNt8PaeDvg3VM7lLfooYEhzWx2njSN2cpKBnYfcd25hStejESe5GIB7cuyEaJKsbuxligv/9yoPuZaCklkUqF8eqRaN2gtaS1j5V2+oGmZj678TWJw7mJhgNVdeNhA2lOTYmMRsWQukhlDdIFJVy5WLsD/rUlS7XfOG0zMiD5010eo+T89PGsqG17oygaetTp8HjMVWJOnsSzAMw5aZkhdblRxSEp6L1Qhy8i7fMc4vYHjM41EDohBReI9odo0qW41DYGQKJxUjj6xdeRy4EbH/TqYLIUgTffNkF2Fhipvd3+ic0j9Bt7FczJ/Bv+HDL1U6o7A8pg+HMywuMEikHkNrhD3rZ/q/5pEn9svN+0A2XrwAimFugOa1AKZDoie88he7pHMu6rGHUDcEbSYbTdsLSOULw8dSjEdLsC3WAyErzzQwFesnor97BojCav/9Esy/A/1hoRbFw7RD2paI5Pu8JVsr5IQ4cW6Kg5LPCR2JEDLKa3dQ6HDCaX3dRB1+4sMIBOr/AfLD0rnM1nPqTeDJEcVoOvezisl9Hgbr4t3+9x37o= X-Exchange-RoutingPolicyChecked: s0gB6Cg0bY3OZ2PMa1Vdr6NwgYFxuRkfNBb3+LfVhOGRQfzQYvd/XSD3/AsPffzvcekkNyzU/ZryLHsIx3VaE4NxqHpi/ArJbe2Ptc7ED3nes/j9lAPRBMupZkuS2rICITF5pUhNh8QAd1qjvED6B2ng/5CmD6gU6V/Zyin4jTJc5kLjH9CQVPTHbvsD/+Kw2LZzGvynR5wXrelkJiQHKc34cq0FSLcuqXPRBRbelUItffkjDhgMyi1RCDHkMYvobcE5fixGy33mTXT9EsGGZsqEITJ5/1sdGoPRTerObB8WVtYBdw1jiTp8yYIbLQDJJ2WOP9sh0rGq2MwzhCbFhQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 008cebf8-791b-43a4-02f1-08df03bb6f5c X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:07.2867 (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: RK/WbkzroZ4aH51oiA16wxu546yQ+OIZQv01iGyjMs7MHIGWxTLP1GLWU4eSmX1o+1g4TJ4zFmv8rOkwD8JkGG7ucejv+Qrx4AinBL/pLVg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8f5ea3 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==: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=NzkYBEk6AAAA:8 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=tMC4LCHGnE-xarV19JAA:9 a=zqED95DPWUTvcrp2mxve:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: GaNAKV_TNLdFRYbMfvV1PmOfK8vSIO2f X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX9aFk5PAlg0AR xxbLIkVf+zZAl+MRoGW4BfBC99udGVQrT+KMImiwEK05+kcaA2Hv2A5mn9U3DXtAoaSaAtgeYAa tO0tNQLHWLycwIuaOxZgqNMFdWuY6e6LP076QpYIxAhSuRA3BXHi6lQWGA38wyBsFj5cXDf0+7B GCU5138B5vrs1vRfWLzn4+HNfI8R6NNKbu7Y5cpcuLojv7D6/xbodPqO9KukTXOALX2dfXvxfXt UwyRPX8Bi0w1AjUDK8LUHpJKAsC+409nlAnerWQK03WdEVsFfeNMqpPVPUPGsrtXzTMASdsw+nG CcvlGWDTfXWj9szpXHZC5OyqyrVlWS5xSiYKV8UmA1qOqhpCBpFBtAKZGfGE88f2jnuwnbRzCn8 /ksrGHh+y1zXxod39D/k3j/rr7OfR2pso7HMUpdfRO7XrqMgVtGgWLp3YBtfLfemQ9zDPhABqSG CgxdEUeaRy8yJz1mRtQ== X-Proofpoint-GUID: HAf0i4hnPNDJInUrN_D_ssKmg1eNsMBz X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfXxwkyUVquxfSG g2GNp+r8IVflo+5ZmW1e9gl0krcks7cjKvJDwzuylkxVJreaa6BpnT+8uZS5s9yffLTYA748E17 M6IaU1In5Uucm+NnQic65g4Z+jGMOSa1p447MFiP2PXpj+YuHurg 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244428 RPM 6's fileattr script generator produces Requires: /usr/bin/pkg-config for packages that call pkg-config in their scriptlets. Add /usr/bin/pkg-config as an explicit RPROVIDES in pkgconf so these file-path dependencies resolve correctly. Remove /usr/bin/pkg-config from nativesdk-sdk-provides-dummy.bb since pkgconf now provides it explicitly via RPROVIDES. Signed-off-by: Sumanth Gavini --- meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 1 - meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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. From patchwork Wed Aug 26 21:45:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96503 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 4145FC61DD3 for ; Wed, 26 Aug 2026 21:46:15 +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.23522.1787780771923475131 for ; Wed, 26 Aug 2026 14:46:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=K5N34yv7; 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=2698f24599=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 67QKf56N410006 for ; Wed, 26 Aug 2026 14:46:11 -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=ctvhC2kQctl4oGToxAV9mAJktbO4y4yZhcC5Qox2hGc=; b= K5N34yv7qefpqE5YzI6rS+QxKR1a8Rj2SVrOO0oPhtTfzS7fZDWI4h3EHbuA/w7O QLXLh+DOlnoiEQiuv7tHeGGdMC3eEjHSdJH2y5VXWAKz5J42TIbUhm+d6vsg1JFY IUhspdfm5P4J/UcR4XqInfTYgrdHf/0eNrd7/ZeSr0OHYixdH4yeAdRTRVrwSmMU b26z/y57pA0L7uLM9qo2lPG9I5w9K5g7OfcKycSBrLpa03MnySiExPjYshlFRuMi 5Waa8f0r11VVO6MpZ6+McgWBbrkOo4Z2LoBo6fAAPSnMs/1F+fBbjIWaCi2SQwdC zzxjRl8M8lCASR3BTYE68A== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721qf60-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=S4wWfB2r0zeyZ1q2/MW1rw7nya7ndTbq44B6ay9OZjdXKKW7mEpzNdba8s5+NG2WJoi6/ZAhpV1XFgZVZY1L0lnKdPQuIHjhAy34XDcX9SYSCpED1hp+ixYBlwlqGbWtXwkiho4q1gLLBJuzjd48RjRAHWZgKjTlJNz29PFGWI8GeRHOo4HQWkHKmfytqMAHIqcDtONjkZSXE+Km82oKMQcPN4GIxKLRIrCCeVHyo3YLojB56ANtPb2m0JVw5JvewJdNeH8pOhaEyTrIAeiPcDm2dV5z7wzOebd4ZSf0orMb3Y3rAIEWC6GmEm6NC6hJhwyfSTDPBFRJxQJWoufKOA== 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=ctvhC2kQctl4oGToxAV9mAJktbO4y4yZhcC5Qox2hGc=; b=ccCIHAihwYYlP64vbmpef2Ph2RCzqoWJy2odYToUAfGm5huGFZOh5u4vEedNkaHwckkS7ip4FFMfssVJXn7ryZfMccwBm8EDIBh2+1SJMWPOXho/zpHb9t5QA1l9W4g4QZA4etriRlnYCkrtYYIBvMZZlBAb4V3beqej+Uidr9mQPuhrpCvqTu3Bl4Uumqqc9+86yZn7i+viNAXiQf0UZyze/lxYINYKOL4tWAD+vuvdlLPpVcA1VI7tHLc5+LzxZDm/+spNbhlmxABXFRbNNIcUOAl3EXCcX1taMhDFR/nP0aZrEUTjQ9Jsqg50A+wiv4Gr6W88StLroeWbz03sqg== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:08 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:07 +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 v18 11/16] libarchive: Disable RPM filter auto-bidding and update huge_rpm test Date: Wed, 26 Aug 2026 14:45:43 -0700 Message-ID: <20260826214548.3002838-12-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: da411735-31a0-4388-b2a3-08df03bb6fb7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003|12006099003; X-Microsoft-Antispam-Message-Info: Wtc9ozg8fRLsKqQmeigkATZkxZS2ZzTof7WUlXFHe4WKsKY0wBCt8CC28+kCK5MuuryhhSKnAkx5BeNncg+3YfMSyfjd00n2HE/sHPLd+RH8qPgQ6MlZk139/zg6F6GJLLxyKsLQP3i1/h0TKdPIpfiJZecaMBJU0BfjFU222sVqOIgohgBmoKZQ3eDmeiBeZTzDT5M9e6Ez1WSqezqzdlvbJQW3rGk0G397fyqhCqXKIsbavvv8mGeZ3HfD7u1EbX3uwtusdnOForYDCdqHdoUF7jAyWbY27UVCzNSmAcpNweaYR2kfqOfwVNyEFrxXH2yCzWxjnqcraEFMzoyKRMwXf3zyv2Go2FqjkznIEiOEse8om5nK7DSFkWJ2wgMLXjZX6MmYaLbt/CKJH9ZNSJ7oaF3NPjC+6Kpp5KePV/1ACdJEw/fqKzbJ6X09gPuS6WgQ6tWdl/8A5n+ai3HvLGvRy6dons0DLyd+gnC8ZF3vZJ68azY1FHhBImfc52bqNLUsnAsTQOewqgfjINa/xa9PaJUQYwG/rg2X8iuJVppuxjHDKq5zTx4xYASaqJYdtusA8Ggwo0nhSEuwVR5gx6uAfl79dolTZ/vtLu0SdpIidiP6D8B0m5L1LCxJT/QhGtxkOxv7AofEcLWsga7sBJFn5x6HhhddRC/gZuiE8b8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003)(12006099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J+2IkxfRibCHQ3lf/i9x06ZcXX6rZAeXFvZC9IPk6Vw3vQ+K7OZWWAdES/QbI8YgJ2HziBUT0/8HNXUF3YZ0AlQeYUbQ4iR/hAw2BPESD8bI4h64WEhzJhsR/3HGLNzOrapihQ5vcmbRUKqMZWPfO+L9IUH6O5idWjAjTzShLs35hbDb+ZorMR2QpvitewkOwC/fzz4k18yRYyE4RJIvhPwiMydeLjYk/sPWLcvkLi04xlIlMVq3PnAv2L7vGdFnnaoVBufIhimQW/N4sO3XpuVkyDp7T34GuQh5gXqEjQInR226n7pcY05VGTM9e6b0m4QWmatu29Mf0rN2RSZKuPdEpWjZFFKQkIkdNXujGXHGqMTNefDT6c848r92kZY64ycidfpR8a5PA4tp4QichN7o02OrkuoQ+bKM8E86GevsuxsXmSYg7SiQMjnqOCTlCGLoz+823d5O3lugN/4X2z9JVzPb7b8zmiNMBxf+iKBAgzmX6tTHF6VthiLoHJEmSyZBLjbSH96S2xqAwQjIZVK/hMR6/7fPf9twOThI33Q5yprhXtHtnAlpvlCTK0dGP8EhNjTjHrg03yQ3yrdLfgpWsfnhvm/DNxFWlJ+FoevORkj9SGl0WlYROVY2sMhOwyuHqJVSdF6/58lDmoDMVMuhfBOnq42efbJkqrBZpB4QIKYuh8Tev/IzPQROOFuRECKOnIuEsOI+m0Tz8nRqVFiDq7B0t9IV2QqyM8idnEYcBSPaJ2rfM8IzL0cM1SGFF+2tDafksIjlyI40PTAJvV14z/Nk8CTDnmVVi9vW1Zz2cMMr8nEGS3z6SqkflXsEnzCstR6mAt8zTZSs5tCmKTtLk5tYx0NpRUgTqA9j2SWcvww/QXsjOrsWUhtt+8KrUHpnyfLrc6t1yg8r9X4tCnlCYjId5YqxeSuS9pvarZaE5NAutEPkrSXOegF0/SxYYK59XRuX/8K24Qz3oZpZxkp3hbq8LTFPCTgAKTINXvD1gukRcsRooTgHwFK83KeJWioIFkaLHzDPW+QOLB0bqSZT3r5MExg0AT9huuw6Lj3MQUo9lrjBJbFLfbryqgUIF1NJdIpYojr6j9jmXUam9pNjg5tILrl0buo64KOxXutCuKrJOfg4jGFSxtthEPbyV4GG9lcGnhme96cKN2l0uXPNichs6SqRsWLxe9HF3eS2w53htc1cYfkVkvDSNEnFmY+Zur3Za2y469+xxh9ILOPi3R6e3JvcZDLGFLqut/e5XWRmcu5gq7Je+UdAw/xTGqwgjuT0GLhlY9nDsjyy5yEy6rc2hYFVa3Mu6+gD1T71Ck4uNI521VXpEpKwaMANH0Em6NgWGktXp6aEsM/Tfk5zNzCDdLrCWhtT9jWxvXt2DqoyvM0PFQlHz6Z4sFG0hgF07fXVxg169fChardD+sKAHpdgXlTlIGlyxfqKQmNsReraL1bTQjKmCjbeL14oVoOVH4fomTp/IU8MjfzFLfoHUAYsgtkU6aApY2CpE/28AZOj9QmNPm+0oESnPbXwj9iBJF8qsgWeb7A5JKeJnMfEcLuCvh20jDKjTqnYywdMUUt4oa8VYxBaVFklGd0Qg0crH2xJQtfG6AnlhaJNSsUbB15wIethP9+YtoXjyFRDt+eCN9beiNr4sYh5RvOZ0uccHPdYn9m4T/h5YE03yjZ/uy1cP5iWau8KL1IYRNaiBekGkY3JZGCUnSuFUXIu1bGrNe235PFnQuLRjmvQtSZ7ILkvnyVvq82/Yn7NjkE= X-Exchange-RoutingPolicyChecked: fCm1GkSRB3KdZXb82oszBlDYU0MyNHP6jz4YbSjFC3g/nXShtqcu9/N9LLV+kTcgVANc30E6z9ezsTdJFHQRRRIViWw5jpUlZNmYOB/O4SXl+4rbOB1SIiKbMf07b5r2t4TFr0vJDi4XdlNhSmj4xBqrnwcKEp1W+G5AgOlXTABZs2NSqPSE1jJJtAywnpkzuGlZ1WjmAca+aFF1X1Rt8dHn0CS9/xsxrbgI+FE7GN2a4GOd0hRRMRlspsroxRscO/2qCODlm9xkts51HXz3J3XQw7gSeylqrfULtd0WhzQruQ3xIUcgpCZ6Fmhp179oxnkn0S61n8fvtueICmPwMA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: da411735-31a0-4388-b2a3-08df03bb6fb7 X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:07.9424 (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: XtMWyjUTQPbY41FFbt8viWhEyIkm36T5qd1ty69vgXpQWIuHfqbbmv21DJznIVL6tyFikxni03L39LL02bRnl6DEVePiF4jZDpw2dzGNf3g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8f5ea2 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==: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=NEAV23lmAAAA:8 a=3uWsZ661AAAA:8 a=t7CeM3EgAAAA:8 a=lZjF4Bz7cVrG58_DQlMA:9 a=fYNom5PXsM5enKJDCoVv:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: cKJ2NhXUDhwc8N3W09cYbZVF5lJNWF31 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX2N7ESLg3jWm1 jBxvSzkdUdvF4UyitzVMbSUlt8nkVxUspfydMSq55DbSz64Aw+cmA/9MLUiYtghiQEdmrQiA8xe YTmlNky/V3LahLnkyJQ82PHs1LIiRfio47bTC9saRdYUI6PTf1RnZGf1xRUmlXBQfHZ4JhBLBDD 3JBWWJ4NqkQ6uSAsuV267/Gr89tDZVXp9kvutiMUMRqghHzFcGj0K6WTI8102Wnd9PGGnUI07Xt RmahPlgKUOi0EsSc5Fgmvrk+WAgXY4krPBEvVSFP5C+b8yXxCvq3twOvp6rDVAA1W/7ZHMbzVXX d04uA1eDnBQKgz4dNtlcQ9WudKbbJr9G2f/5ZOz03d4QrJEJ9C3rVzJQ7enahE96MVwSS2lbeCu Ch43gi+4o78VeGHQDGrGjrifyoq7DavVnizTXpwPLgOeN31YrOrKp016UgOHG4kkl6l9C/UTTjz tNJYZBSelBJG5hzBfVQ== X-Proofpoint-GUID: 0DUhKeTW_YuVTQRDzNvxy-c2PHuOs09K X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfXwXKO+xbrIHIj 3sK6cNyAce5FzWIVyf7y0MJjfQolMdrR1bNn/X8iWeczrusj3uznrX/puFYHFw8n9ATkBdwJ7fs vnXH9A49gsBSf8dwT5TMqufHII/1fqi6Age3WWT7yppmDc3GfiEG 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244427 * 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 --- ...vert-RPM-reader-into-a-proper-format.patch | 42 ++++++++++- ...0005-Disable-RPM-filter-auto-bidding.patch | 73 +++++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 1 + 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.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 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 Wed Aug 26 21:45:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96501 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 17615C61DCD for ; Wed, 26 Aug 2026 21:46:15 +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.23340.1787780772310712792 for ; Wed, 26 Aug 2026 14:46:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=asX2tNox; 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=2698f24599=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 67QKe5XW406368 for ; Wed, 26 Aug 2026 14:46:12 -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= asX2tNox2+8bFeOmvsaIySzEWZHZ6jqGOrOHoxFrOqO/2IhHIFYYRncfizJgcz05 WxUog6wObnl/Hk65z8eYgNvJUlFuC6Gwc6GiSLICI9Mpypxh5ug2hIUCLLBnkvrf ZXzFCftRwyK4E9Fo3NbGdvLFQhg982e2ldK8GTJNUMAPvNALeMvNSMFwWPJ1eur0 45O4KGjg0YQXFuc41EcWXUyL+wePYxo9AS9zhOl7FTGDKz3lVZMo5DP0uu94Q2G1 h8VHmv2gfbUwD6r9GcgbzgjFAp5QLhoG0oIb4/89c2rT4DKAdt+wsdG4aA4UnUPr joMheyaCW0yHD4Cogph8aA== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721qf60-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xmQnvv8bVOeNxmUy9RyHVPRZyFXiLLRrM4y+FqKMX5g58niCVFS5q8jyqmqrADk60m3HYEWKJuxJFxIB7xAufNVdwvPcHy/5HQLOndqlo/bpSxOjj7BFRVmWBEisrC7R4kaqdV8VRRg4MPEtjXmcQCc8cydaYn82eheZgKmTe+OkcBy5E+PKMYiD9d4HatdVOvT55Np9D2LsPpU5QsT4ZKmU4bZYUzDNG5qtgAAgT03eVOdcXoz80HT0SjpSp+Ze73atgW8ud+jlL0bZpiLhqANknN3fWa0xuOdW8qag/kiDiurJQZ0TNI5lDRjk0DEDJTmlqyG+gGk/nwsgAWtbhw== 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=Dr+dS08F8eI2UwROak0ReGWVR8IxOCzKIEdifq1fei9qI2l8IlLnpR7bw8PTDtidcEyRZs1QS3Tu1/+Mp2gahXL+5fSbuO07wrH8CNi4N1kugX5AGfVMRq1477R8Ks36IJKfqOGM5vN+RrfLs7n1yWu9nkBw01lU8/YNT/hdKErECGNZob5heYiD3iV+IvCgNPVSni3QhsHW7y8GDU7OK9bk6cpzkJQ1AWnqjPwfCKjyDv0k1RtUvDm9+Udo0IUU90XyjaQpl1sS+bEzuDaMqSP6CKXoSCs7SJl9kuj3xlbQMOl/qv8RMyWQ+BzsUOI8qefii9DWRND/6Lr/rWxQoA== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:08 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:08 +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 v18 12/16] package_rpm.bbclass: Suppress pkgconfig() Requires for sstate compatibility Date: Wed, 26 Aug 2026 14:45:44 -0700 Message-ID: <20260826214548.3002838-13-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: d7c1eb20-f0de-4e3f-300d-08df03bb701e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|10067099003|56012099006|5023799004|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: 9FUD9q6jp0La6u+HABdxmmN6v1mRQpPldrz7KZHukR4mir9iXFtpKgTG5/KYsDfvTWlKMNup8ZClQqXiiT7NXVPKQLDMCstpSF7y3xfPBOcOVWj38UjfPDp0lT2U+ZuddnDhl+ntdLZNBsbYgsz4Nnoiv/On/cQIpJRmR05kn3Rcu7pgzFCR4UkBzYYjOwMYzOzdkAHzOmdG+AFOkgAAp2XY9dU/mqVI3eY/YTV1cUXN9jUNG+waGiwzvkxn88YUlVcjdtGfa0Cu+gjK99bX+wPrQfQ8pqSK432YUqMnLfGoJ4Hu6takIMKO7f733ZwaYxfksbyq5Zy5bplLw7Ce8kk+GLItwP/2khpqR5uLEiM7j/tttfo+ZNVZ06aAkozayfQpKeBiyliif089o5+eG+sOyfiI/gDgCyzYd0brWRWvD3w1Z+P+7GF4QFrQpBuwY/rWDdZdp6jvCNqvmtnjR/phwZivUyQmRT0cvOeDZP5Waarj+jLu1W2yjIvieUqZ6VLMsV0o46U4JuBN5oqSQ8VtantXmKjDvbUsXuNuU83Az4vzqFuV8A9M/akmMeAx9l3FENYwIvbgRYK7V4HEoHYuXvWMB2ETKkUQWfhpcM180aMQfBC5cgoHcrnyHYS1Z4QHpFWjcr6vdA4jmwJ/8jw7mvzWx2O8S7Uk0Mu2uEpg7G+eL5P0TInk40vj3B4LV5PkYiFf6imVkr6qdm4YRH5Y2yzV7PyW2Ba7qMnPuv8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(10067099003)(56012099006)(5023799004)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9gz1PazmFoclntr4s75TGeWtRboU8esLmHOJJD7MiXfgJCJcaDzI27D4a88MgJvZhO7w9yU6F2UGmfn6JaZmc6cISoo12MsnSPPQPFA1en3UhW63MzGbOm27MlsWWB7AfU9gyhd0gtBSncxulRBtHsc1dqSRNBSz8b2SG89M7DxSLPO8J4WNihHZaI3gMcThMsZhMeDyBQN4/a+3n7kuPCyfQ+gHSGWKCQQ+fpv3jqtYYEf8rY6UBlyrTP3QNlGkwyjTVmPAWtCJq0UHSsrEAMLb0Es80jfsPH6sqY+H/aHz3p65ZNxhcp9nVaUXZqVWiy4gBfx9NibNwKt+INyhWP6NeqiAMToDm3BM72QgU7rKVodvb5kf9Fessbf7yRb2TFJUKQLvM2rJERumQOq4/LloM24D3kXVNELMefcytnZWKTaUMKb05nAr8UnxRcCc8IVPgu6vqLAJIC/el7a22ydOjGFbr2L8WUplPpmk466rikq2DMC4H/FSFyYn/ZV0ifQS8onAzQj0ivk1H+/CDx0qMuNkgTFGruqN+zQoy+RBTMUYVleq4lcVoPkDTBy9jId/e4di3PdWAlx8rvP57HHpMyQyeUWzcLjbUYL37fcA61Cu1A+AU/tCT4hby71ipJIOdn9HJ3xKMOA4HjjaS8Y+IouVKvHLaX3Bh7tIdFL5LUETSpql7CWERRGlUYA2fc22iokpcUjQe57ba/gmUCMMxmnI2WW5uIKnOi3k/wn7eQ6xguxKdX5TUim/O/BvQkMvr4l0N/3LCCrg1wH69OXi+xR/hbu8ctiy2YSUztZJOkM/brw7gn+n/u5Bp+Aj1Us3dvMbiEMtTLE4DI6CZhaK6M68LYqacQ3ZgGdmW2eGozEp2EKVkMARj8j96Ys70ITqZqN8YC9b7a+CBP62TtRIQAjG5sr2UqRJtJxStJ7Z9oiZH7RkHJ1M7546h+mDfWUhz3Xjom30MMrfuPcPpjDIYuU0Pr6oZvx1oUYDaZjnDbYluxogw5Dj2LcIwRS4aDR+UEdhbtv/e8noyc12LJelP/kivWypoBDFhfzFseBIcWR+AOJTBTcttSGHEEh3ALIG3kNF7XkuWfTXpzD4H+F6dm6MZd9AvBaTUEp6LLs0ifvokZ0/zwhVL8eEYVTghGtkQD/Z6gbDzWRfOYtuJJ4ut3RE5khlh9HZUov73YP0vhTyqDxfAhXZ8hMM6Y6jkV71XiB5xeyDdwdyB4hI1m+7RlTQK2Nmlb7qdevGiKhXiR9BaneBuIe367FmyWBdCEOJVw5ATJ6R9UB8hd3jGeC1hwvT/QaMnhfFzl9OVEU7UqJ006rBTuXvGGUiVlpu23BLEvSowDKaLLxxkqw9smcFSvrmUzs2q2c6HuURSM0lMslWZvd00jPC81kp88zShWZ4IvypDJVnJzcAltGPe8XqTV1uMvkwGrlcWnPqBO+F5WOWunrnY/Qr6ID5YcOVJW2wIj/a7TKKFCa7EGCz6lajUobH3+eqNVCGrk1lgpO+1AolTh+FoZY+SEWv7kSuY92mh89PI/+f6ubDJP3SfCrmu/amh6TKo4Cg2DFve9Ks15piPnlkv1oFfanf4gIP5mMG+k/aOLTuaEJrodx/UTM0OkeyYJvAzwKig7O3G3V3kytrzLF5gfowulH55b/RaaQSerKcH4wN55bmaN0vRXHowB8vxjlVG8aIgR+j/+ww3K7Gkku/PaIjEXCt3LLAqTAHoAvNV5Yrysvf7kmRbexPQC/79adHAFF2DWElxoY= X-Exchange-RoutingPolicyChecked: JckPL3FvKdV0IGuTZIFy4dDb1slg0rMoZ/bPH4WtuHRvGE1y4K8wbWbGYaS/ZiCl85fGgExQs2Hf4PZ8McaDVAiOkLNZM7YpdxtA41bHN2UZRyIA2Hl+7WCKIMd36oH19gmibn1n8fvHYjv+9bif0ClHSy9YGu1uCA4tx8+tI4xnjR7buWFlP4wtRPayN8ijOZNVOxcHZx1lbgaOmBX9unU4CGrsaH5sJP231m0JAzTTkhHk4AGuawcpODTS3HmqJow/abYwM0El9QBSEUonVfDO+DaI2Hpya9pJ0zOTjDArh54O1EzEK4hWfIdQl73trLxbplQM1W9qKPo9FBGWBQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7c1eb20-f0de-4e3f-300d-08df03bb701e X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:08.5823 (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: wLbqW1qpYKrsCTZgBB+t8H4pxVlrU8mmUSiiBjNoBs88GnqyTZ2pSdsQrV88kUKE5cp2Xz3mhrihGCU5svvjLKM2lBipTroWOMDKJXWKfuM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8f5ea3 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==: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: 1n0ogpMPmMdZW8gLlbIvyo9tOHYPD9TC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX6hHvW2cuZDOT yXV+mqdSdUxMN/VR87WdY1faR8VP+CBX0RtViJlkZkGSG4eiPl4/q5kAFPfg2s2oI1/b4B5IU9z XcUTdzUaSwAEPGn93on2ssR0PaTL9S3l5WyrtmjY+ln7y9evkkhiQRKyqH6h0STkNG1cNFO8zVf 4rCdEiYWf0Unln5gtEG1nRz0Y0E30+KI0NrLkrC4z1dKtfT1HLalOYJknL+Vzg1eUqXEvO+60nb p9djctLOLgmdplNgEFYMGt2DpeLkp2Trzsv51gsIGffhQ33338/6xt0ztPjBSiv1hOOMAlenA0y 9JEBIIFMmnvP53VdYFd/e3sTeUMd5mxKjJJWXw9edO9wVRCZLrcFyyMm0/VkHcQb3xzUdEe2lQf Rs7F1jA5O21rvGpVcrRtsBTiw1b7+PGGD1ccY7oTWXNkhqBFJlsClfY8WryZ0E0W92OT8kMVhTK 9hqSf+b2E5W++kI+E8g== X-Proofpoint-GUID: o-Js4-K2ypURnaz-5UFQhteGU5bDTkAY X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX0RhkbTItZDd2 t7Fv3AGFy8o8NlIQ/zpyeMN5V8cCUIhxgmxOpfGRZuTWpwbHs1T2Ruhf1FeU98aEgnoTYhO46/b shzgof8CakAddwY3dmUqva+4G2H7tXWuyGW/e80QzHmANDWA/PVp 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244429 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 Wed Aug 26 21:45:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96510 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 2A83CC61DD9 for ; Wed, 26 Aug 2026 21:46:16 +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.23523.1787780772655174044 for ; Wed, 26 Aug 2026 14:46:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=aqAqagP9; 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=2698f24599=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 67QKe5XX406368 for ; Wed, 26 Aug 2026 14:46:12 -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= aqAqagP9ro0eP3KOBAi3I0FhvH6Qq9RFXN/zV7md/pBjyACbFQBOKeE5z+zlpkzO DOlkiJ4MqQ3eKd4G8ks7rWAUmeGxboqtRUXILQSpkB4Z2tRkrtQCcr4RQ2wnjIQB GYbZPrM2CpKEdvpnw3srzfrCcgXE/t1QUK/8bBK0xwyzLhf1bUCZ0nPSmtreastj UqYDdoH5S+Yxzk9S5LjghYQgVXgfUcEUSaEnOYRyijr075sztodnrweqVRGydv60 0oOj482nREbvbG/JmwZLFvZGVvouUwX3FG/0J7SmjPQdiLtWHaYYgwwrrtsB3tUP Cp5cl7ZrW4/OmoVc+HDATQ== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721qf60-4 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=V4OJwnJ8xUZcPvmSzmtoRPsqsXEn1o3UKjXfEJK/PCLVhVwKYnsJ0N9LsV+c0UDoBOZdjbFoJjRN0uBIe6gdbq1fBy+K7IhuZ4fVxgxkONQmBUoq5Em5K/ifrsBw/8bxnYRz3NPQp6o8AAiOqM2iGXJyUfpPymDNiIANTumGyeFoy03oqhq4o5rkqpza3CJcKxm2PgPUpDVjHX3qg2w0Vmo82ZbXga/q3Em4ToNv9t4xzKu7J0myp8wJzORMhyG82dHak3JJ4/FTy1J9/87zYSK+OFlwreOSeoVxPaviaqeYsTsfkXD9GLMGRA3qmmP/PjrjGf7VNocVN74ABvCpoQ== 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=f2Xck9TugU+q9U1/HL+H/eDg4QeMx4fm5bKEroYmB8YmfAB8Ia6vVVwW+CdUjCWjOFx8CC7dl358g+GcuLrtI5UJTzTQS6K/I44SysohoqG1xksPnzx7n8jyGlyI1nsAhdXPQi+ujgdvkkHHxiHDfCc69IvkWEOP/YXknR2eYLqOA1IB0T7YiReVmxcqILwr2ZJV+kGgELq3FZzeXH43kJrhU2Q5jpFlyNAlTY3vSCLbuVbsUQJ4MIWRC1ugjd93PQ35V/1P34Ehn6DjD81b40Bcm6CKLAcCdHbtFSny14dlj5ss/YOM4KYiln+ZanUowbqd2gqhRFhUZAgGkjID+g== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:09 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:09 +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 v18 13/16] lib/oe/package_manager/rpm: Enable DNF filelists to resolve file deps Date: Wed, 26 Aug 2026 14:45:45 -0700 Message-ID: <20260826214548.3002838-14-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 3349b3aa-6696-40c2-c7cd-08df03bb707d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: 3d2ZLQr5TqOpd5EB9N5X5cA+dsXKa7jw6snuFVv9n5UFdVsb9jUi5fAlgFdN4dfm0rtbqn9PEV2iRi4A62+m/zB0fmG7C1fY65Z01cWLISeWU5AQJmCpixdeHqxvb/AoC6qYJf6tshN5485LvLEJCX+4DTUabvMCSCC1dZ1MIdwI5day6EEUBnv4jZq0XbhbPASs80HyAYwszobXmWPr6Sa0SsMrhgRSt52qv4a6KhbWKpzDdpEsXi10O0mz++NhLtTrROItt7Gp2FROWK7GXX61sW1UVHl2y+QZiQdIz4pisvqi1hHHkPTU3KB9buR3oykdjVzAII9BrjtDGrrdBH60ZMGtFfFCWTt5COvbcDbUyQbEbKcu2VokSG+K2pyPJgQ/0yFKyrwklWUxByfeH1lQp2rI7C/bovGxsR16llJ3DaADoNNm5VL5DDMtdFWn7pDvmDpprIvudTDCvkLUuTRVKDzy6YWUWylFZj+OOaUjnPyaCx8RpAXXgVl208c8FvoQeolP+dG1F6NXHbqF94ygRaatC94yYGqU7suwfZwzlinhyVYekJRrMeKXIuENvrcxznINmY/3n5baL2per1STr5IGLZyNOXsXltM2ryh8kz+Pb6ZdXdCaan5wfsflvBH+a3ANUyHlVbagiP1qIoNpIsxp0N6WdJM/DnQVdveayNDtzWX2+czOrHkQP8z8jZ80rMbjoLet2Wh57y7V/WX8aEAz+/Y8MnIf2ER0nv4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PzkT/kKT34zkVoC9wne8B/iytyFPREiYvaFi8ASkc8geSbjgGXtD+hM69F/t3AjeTbbVzfXiXjAkN+U79zeUsQCEBWIUFouvNtqI86A/VQgmuC59KpY8GnppyhHlMKEd6Pdt80TO7GVVlKctrPCQg+gm6bFxCBdsDye8PEpJEcTWsQG9vMBZ9YMCg2bk9r8WREnRlhSG4SLQr9ZJiiQL6FrJ3tSohu5/aNJEfo6sA+ew+y5bHF4kjVIPbUPFwgMVFoF+pJYNmjctAqpRcDpkgkqZhq4fqU7US295uzJ51WiClmKcS0U9HHniSMVY0t9S2Voj2JGfJzD5r2d9UtyUdR+ek6jGmjWXCAlWGlbRnwtK9Vb2HiQ1jTYvxsM4hk1nIEJQQvalfA/bqS2qmkO2UY35v3KuGMxndH+JDLx6jiTZcREH3h9nSej4608T3aqbMkQGzWOS1ZXCh5S3eiihrpCOr3r/G60Sd294Hz6XYhdpmGnmT2wEOaQH+isUrwooHSG3lW6xzN2TeppFF+NXM3TVQr21rrkKFVVHp52eeRx63eeYSM94VhmDzROmfbggjoeA79UpzNso0TGBxIlWosH2PK8Wg0WpizKL6eGMTnqm8HH3tK36qt+Z9p6+xwXHfG8Fl/rTIAm/eoasTXbdX3BxFj82VfOERJK4q3liPRFGOCaN0Msv8EOtBewgY8l6gjHVn4Yu+pxptCVjI7YDOYMUl3QWQxfJvfWwzIIZOxLVzCImwCqx16Y+G18nWHNCschylmBMcXOo8W9dntVHnxzuu6BsR7V/+xxmbeYuB7aq93JgAnV6Y77yhYcZ4H4JVOsRUdlFt/grEQUBenWB6pBeQ/owX6X5VO00UaPY/5lnA+1znoK9Qe0HHVYcN5KI/RzG3LcCVkX06GaCJZRKQzkWdMj8LcqhkoiE8qAD1CODceqqoYg0Q05cLnE3gctu68j/9lM72qwGw9EPxBMiwFczN3ps4fiSow7f5b47zz4LF/eql4iVaOzfdBhkmxcYd2OGk49Rd2MHNtfmXAsPlESMNyAvv8NsYyo7rugZsvioz9I54XIIL5l4xsKo2XCvRl35tEXThf2UWWLdagv+2kLf/IyrpkMU5K1VbvLW/ka7+k16c+6t3txAeAlaKPu43uHuCdi4g54+wIzgz7FQY3uJnIXOG5/YsLHFsySPxDsmocz8PHSd7huslS2ZegCb7UkAKecnZnIe+tLY3QOn/e4gfbzs8iWqjSIKknMvxNV8sr+KXRbBXWyXMxEjXhMpYebkJ2zSQzOwTcPbdFdzHpRG3jTsrn7bHwOJj0RzFiYM6WNCDr5bPVqpqJdvTSimToJeyRQSIf8K8uZkDg+gvsvVcSV0hqUui3rUisS2Oj8ezbPeiI/Yn1FUx9FlVcJBKdlAc5Bo4x9cm4FEC0bpp1DuchDyMaZ/TqRaxnlYo7by+X5mlRVvlQl9fRmqjQP0J/My1Wds8LHbLfq+gXfZdvPLOEKdA7YJTxFPqa/2qqXszpX2Rra1/ZN/P1hOLnH3hyqjkzVFtC2jYmZhff2QprdOcs1rrXKcNIVjX6xbCmFBONdORbMHcL0dnXOcRx0kipN2pL1SUjq7bMikDepATvy64//j0KOyxjUxLlnZwc9dhOx095i/BNtpuayHkNsLQLAfQ4KxsnzhHH4gunmkwJgkfhxuUG3Xc0jBVlIKCofOVMX4C3bKCdmADAEfYmCbZBdFRKfYAGE6Sm9+Hi/hoU53Hlk5TW+2Asa+iH2jVLg= X-Exchange-RoutingPolicyChecked: vxtLE29gmBgU44GvDC1/xeGsKJqFhWm4jyN8CfV6P6v80syQtU15Yik6Lrn2gXikPjcQQ+bpDXz5n8s9C/edcRFX8B5VuuXms8wsIykzV/I4vDXqyHB+4DwWNsdOWZrjLAxhMg6ySqxMsiyKsFpWX02pNwp3nWzlZo9LPUyRewDTI9sVuzC96guYtS4KBxFeIlLMhQJjCtnTJxdG3G1SCHON0X903vbkjb3I6LwHO2cWS4nfQjXxo3jc3qdeHpV9Khsczzz6JgyjW8L4/WhRfmO11X3+P7d+661gBV/dDy14A+b5BaljORf4a/hPRAifbI+9KXiLl7GgVf6WQ2iFLg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3349b3aa-6696-40c2-c7cd-08df03bb707d X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:09.1841 (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: ona+VPsTZppTrSa/HH07QSMpW/MRn8NqelvYy5JejH8+HVUo8nJi8DaOCr/gYA6u3wH8Zwj0d21MRWzbIcn844ol22g010UZAhTTFk9sfq0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8f5ea4 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==: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: JlnYkP6ZHqM3duccjbsc6hCZcGEv1LKL X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX0ArhMOpyvs2P nsclC0bhXyR4EyC9LuC+aEqV0+Vs2gP6Kw7YRc6x06MoPjahSE3MeVd4a7UwUorc9fQgc4UjExW tOoXZor5Ghak+uH1naxu8o4lFiV6wL1YH3HaPiuJ8t5EhRWekp2Swr57BL9Zq83XnQS5Xb91MZr soNpmwPzNQY6SsRv0DYSCTfqE9qXRbuOKTGcZaZd/KCoBKhUVpfiH3+2y7U2NHlssKZ89ZCWyZF sPZ0wJ/UANe7QoQ7AIRddY0mS8RJlFrawT5J8cB5VGA3g6iQptkV4a6zYsrcLVYMSIIZ4XPXVyG cLxPtlQbAvr9Wxe/Zj0/ymjz6ptd1C+fAnDOFd7JeAjkymQ6+0NEz2XyGRsdfVG7HxiSnt2R5ia qRzCUnPuENjNoqj3fU5+maD8C+jyxkFD9Jin+U5jMoYlzYbcI8sRn5ofRysgFMDiK+I6TqxolVT ElclVmAubUflUVaff8Q== X-Proofpoint-GUID: aT4MbpEHC6Xrl_GeRgKgPPBU3UuXN9Q4 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfXys0BKCDXRLnM yNUQPKXqjzKseujPL2BOM8uG64JtVkwmgokw5NN+pHTKbhccS02i3e1Id9nyF88zVHh+Tsb7AZu UoYr137Y+4WoW7BGB9M8yoL08gHVYfGrsFfn0dozEpkf8J/O8oAh 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244430 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 Wed Aug 26 21:45:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96500 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 DA522C61DC7 for ; Wed, 26 Aug 2026 21:46:14 +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.23342.1787780773263369396 for ; Wed, 26 Aug 2026 14:46:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=HLOtl/91; 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=2698f24599=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 67QKdDpZ405591 for ; Wed, 26 Aug 2026 14:46:13 -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= HLOtl/91mS0aPctYzef9jDRrKIFwU7X19xdE7oFrZDxP2xTk15LBwwtE5Uv1VLfa ETV1/t0rK92dcP1DgBnacrKg/GsxGgV3kADTwq7Qi5ewkMXx1i5NTb2XAH1LV2ti 0lnk3Wvz3YNJuaTHjmJBEVyPgJM1EMTCiswZWTrnKPqbaCa3/C2pf98AXdrK0lB3 jYkr4fKHrTgcoHs3u8ImbF3m5hyLSU04fxfLLkr3FMcYhSw0ZQ/kjdiEyIblAvTN MIIEq9rtO8JQqoIhGsSVVYLBpbCCNwJnQAvcXwO+LwD2qZebXojXNk3OQQ2PNO95 pxwdca0wDrcy7bcYUq+Uhw== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721qf60-5 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ILTyqI30BVsjaxjP/SDlzHvSqmRA9KPNngWInaXLEHGMwiaWw0IHJtFVzPilrIaFhh/AGPk4+N2/ozRsH3/oDC+PmIbi8esiErC5eC+3x74Kx1RQCycFOqtsOMx4ZITNUZ3BMjgHmNQxDIX2cv2OqU0bw9/noi3TpRjcmMh5mD6tccL8USU6axAwXwLZVy1LjRj/UZfczHkfsfu0R+NtWAXZM0xbkMJSwu+PkgcHc/fmdYIuQYrT9BSt4Q5oXTcPXHZtTnPwy9vgnQ2XPpcRp06draPLvKYCTwFMDDYbrukqUes0+9W2S0IZS1t4yODWd0TrujL+bX6/2RSjFUVZLA== 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=oh6Vgi896hyiSCou0nIHVV7rpsey5t3+HS1CQ8rvT1KOqSfBjoZ30fHjKfibFqUE2AGUkGs53BGVnnw22rNnWPO+/siqO5Pp2GhEBo0/KvP1b4+k7OspL4Rez38VP2SGUau16+hTEiiH6ImJpAmsD0TBFYoz2kcrDlw8tBofgGW3VBErdp34+EJjR+TxSije3UY/L2mS2F1vYqneOPRMWpLmTtO88vu4Hzmyr3PJtO0Njje8UAyow5puPb1u4Ar2q4VcPe/d7LaH7jb2ZKO1kRRSA5aSGYQ/+gobpDHPrVpJmcC8r+J6Lo4SxcLzKptCZe0yhL4PHp0Daodxin0SVw== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:09 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:09 +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 v18 14/16] package_rpm.bbclass: suppress RPM 6 fileattr dependency generators Date: Wed, 26 Aug 2026 14:45:46 -0700 Message-ID: <20260826214548.3002838-15-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 78acc1f2-dc7e-4c12-1763-08df03bb70da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: hoTWdA1ii7oWOyXr00+mdjJ6VtFPKsKBsyDN2sytIbZemGI7QQiZa0ykOwCl8V2eTWvf+dHXhqLtRyFSmoBoDYBeWOb24pYbZn9GpDU1//MXno/OvLq5Hy9IfHwmvi6G/86KWGXlYiUWe/lQwFuSPZuHxcRRKQR60lYcGKh8EbbPcg4UECs+0YdCn2ZaME8EkxxqCh29IuWNxSagjHFl6JmQ2kU1aXkbi2YZNuruqhY2hf16MJS2dfY2XjnNUlCpMkWhRzF4YQXtK8C6wOXrRn0xCfu3s2U2COu4i8mEi6z73iAgwrecvg3AjSdohAAh52aUr2s74kKca998mJFdWSgfWqxIVPb2OMEzvfJX/WLQequxT4gPi8Yin08wBECyWQFJDxNp5bNp4gs4UWwoCQEL/ChhDSguX4x/5PssCGq/cDe9ldCchgsBt8RupYgYnuYsCQlrpzNfowz0ksvw79W3wljucjCNrHTRjy9qaxZAO5yv6IKfchobX4wkH7LDfV1p3seFeDlVVWVQmqkqY1bXJELCPQi9eUYoc50R9caL2rGMFaeOG/goIfqvIkVWIl5SS6YcrUn1yEePDAJP1oz+hisaBSXOUQeEdWcTDu56RNY0RiUwWPGOB0dd8GopgJWN9G3iaw/7sCFwYN44D+Fl80l5kUMQd0ZyiieRGsNtKwfhnGP8eFMeXMvnVmMRZim/4evUcF1xVnf0DQVvGF+t0vw19CrSDY70lnfAcHc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M3sdHGpXWM/JFlyAwKph4MugS0BSSMP0ziF72Yu0pOY5O+uRFm0o8pLOsfj2V9XOfysaO/+523acqumNM9Zk4sIGLsA6RBYwWzOMaoyEHNFA9KdooiPcMWBbgJTMt0gRbVQvgBbtxxlYEr9gjBsqjbCBvXOCZ7ATK2aIar+TVOlnzo6rfsiVh7LHL/9+/Bd3mpKJSvwKYyepXEOgyWC14jysXcr6eFt+t6FDV5G8+jwE70+JNs9sRVLbsfu2HaxS+GHkhBG9Cvfki/40fmROJ7MRbq2GT6+zyoDPgSN6RGmRWei1U/SixIfDQzervR3vtpVviO+B8EJwCAKt/58hOOYu0S0tjNlevgil8YMnBfGY+p4XKI8lGhUONhMvLqM/i3hw9PUUPDypRn8/+AUpDcBznHoWMsCHHw5oYHp3tjSj1GYlFt3fRAeM9iMNnuOAQzmbT9P0BJnbTErAFDZEZ54Ip9jZnWAI3Vy5xSdXvxQTtWoP8/S1IPh4jnA/4/Dt41HPnPATOzy0a6/kksZ4DadsF5fXR/wVn3SF6HhHS1mAXG4tO3j7uvHLgrpIl3d9Xy6ajFDB/GdXobQYhSybHKnntNGsYNysf4J8XzqaGmCmq8SJi+ps09r7zPcUpnOYakgsoPGHbDiuSIcjAGOgdgvz2Xg2VqztdcdR6flfcFClMtSwuYWJmWDuGg/vnQXxpvenmKGZw0mSPqEupie6J3vRGLHGpPjxE6CxCZLpSrWwjXiGyguGhyW3608IzlL2BEBcCcSexISH3q9a9n6+Q/cTmBjFJoDKZcEIhHP7hNWHoiZBHH6dDcCNOAtPT4OqmBguqghp9sEtMve262yAiI3EFHOSzjE44DfQK62lvckvUmxcSQM4+0uZMwdEilj8F6SMW6DXOmEylxVTGH7u/Bcu29dLclUWcgXjCrjadSUgKbmdwgI7vv59rI0uSNAeQ46oLOJgpD80PR3NmCIceSu8up8Lc/V5Xn2x9ctelqCE3KLX7EsLnE387JTHXP8o45ft7vx2hz8GoIw24OMzT/7BOIFKBd8B1d2EI/71mXvpEOwKn4Qa8/G4enOGgcGUi8ufHLEeVE5wJ3VFbj3CO/a9QVL23dMECqBMgscBKlNNrFlKj5XJPdpc5UoG+V/iFnBXCuvtAjH2dFFhDc4MfYHY8OuW2xaC5VZwnvZAx/S0ZjziuwHf6sfRCGZ1I0IxvEMpww1xEzHbPShnJhAaMgOkAuvu0LCpNajNWTf2cvDm5BOQLkIp2NvdVJoiPBOrvLI6twx0oGzsbL+PNzzKB4eWL2VSlsznHHpsy3u9QfwtSMYAPBQ4Yx2nrhbSHlpPlSPp5HggPKQZ/YVhVg061j6uuhiwxU8Mf34tpGRh9wQxqnAh9nFh7Dah6of8WMmPUlcdjApjEFfxog+SiWDvivaOwzj5laqbPcqrAFDJ2DBOyTfXojRe/Shlm3tTuziTMOuR+9/QoL1a6akIPW94VJpX2i+VBVYNNOsf8ebgh8NKI87FE+zZ726KSEAEjb9y52rk3tIb/RhpVcZ2SZOyIfp5HTJl4+YZt7M7yU089jvsp+beo56W1GZGvOir/qpLfSj+QMK7ytylONQwqvYRMxChhfLdqqTAO63pld1H/JfFPkU5bdpuAXqTOHnqA4puBTI8KGxeOlU54YXyllpxJ3VJfmhbna7zQb6U1EujprW702xcDu/XZ+ljA2WS8aqfZZeq3RKXRHAF7e3C7VFo/SvbvUcjkFLeDtjsdzl8Ce0= X-Exchange-RoutingPolicyChecked: uzkSQbCn597NTIjwi18l0kqruwr8SdSnm4brb6xCAlO8MEyW4ERE7dN786UCm4yfFBBImU40dF4UKEaiqf4xtMcZTIl7pJOn3ZPaVfWp8T308aIphUqZiBTkjtoEN791pnws3MDyiYci8UDwFJlHnkswHztjLlMh5Tra6t42/PWovwcyyle+U/YZdFvJNqYbyWuG5w/rQYJwbOzzUwoJXGZN/dX1QXQXbotdPS4/i0Sc0Dob3vLyAq7NRTFEY0M/MV8lqOmrWuFfyh66A/7TJJrlE3HQetmFQRdwwxufj1ENFbHyz+nrunHJMR1eyvXyvdPtRS1dbXoUftA995koNw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78acc1f2-dc7e-4c12-1763-08df03bb70da X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:09.7918 (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: A6HC9YOwUb2lLqBcdyFmUchn04SG/jrCrib3NoeitEYvDdCGexUV+mwOQPhK+z9k3Fu5PdRPNvmP9crO1oGOr8fPxLwW7QB7Y4sWBpU/e8E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8f5ea4 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==: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=bFbyjWf9jMRZ4lLZV1MA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: J9cAUzqBKThffQcpJACvme0W6QhywRa2 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX/Vn1oKTB8t5a hKxG9jvtbPbgvBE2zOIMBE42oYEfV7fIAB0hwtSNXjJA6kT/Pt34ABSpN9ZnuDduD9XO5ob81Mj ZyPzYA9PN+P8sGdXr4+9xAnBOFF1h8jvb1LeLV+weQJNJsKs2fFE17zHI34KcpGqeCyNS8jzgLR HhBTr8C8OeXToaY7TqqY6IUtPCct3MiDN4EC9xevx38Z2DmBD8lxV/82DwwzkB8MUj5HbOCrBwC cZWTI82d2uW+pkSTjDVxINf1Iz69R828ZZ/fyI9+ppjYEIy2YjXfc2bN05AvKAwFAfyga+M3jPp DHO34+DHfS8vSch8JiAoXWxdTEpUgmgRMHUPB/GQuUgeSZIa7JJ1sUlaZVAj0QXI/Vj7XsTqsJw ouSXr6TqYNGbk6zBv6K1ky/T/pjFeyvsMLRIzF1aeuHRRhSb4sQF0kM4RTggcSybQRP7KrAGIMe PHqA2OlAZnDjJVAFhgw== X-Proofpoint-GUID: MQWapRlxnd85-AQQJ8w_GTBS2m1AY0jI X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX0FsFxN/bFUIf 7HuP6iaMlVwni7WDD+c/cSk9aCqRIIEMfjDq+jcnuRcXo5fZ8FvBEpJEjVEC6XRN7Qk5SzLHrBM XIFaY9ec5Ononzf0j4+z7lok38uELaIM9eD9h/QMjvIfgAZae5Hr 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244431 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 Wed Aug 26 21:45:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96502 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 C4EC0C61DC4 for ; Wed, 26 Aug 2026 21:46:14 +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.23524.1787780773627281446 for ; Wed, 26 Aug 2026 14:46:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=M35XjGN4; 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=2698f24599=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 67QKdCQv405552 for ; Wed, 26 Aug 2026 14:46:13 -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= M35XjGN4fvmduP3+/WsSqLTUmLc3ONRnrelWv0wSpSOGdSfvUjItyI6wjR8HX0fj 7P1q+ggrUn25l1SeeK6nXGBfgMggi+X2Cvk2wtunpx+4KKJXVIhvnjDapNliygCd HISStru9y6RRE0S0LokLWXUVs5yhuNx0Tob/3ZukMzrQaK4aFbc/Crte4cKn+6kW rMty0bEoPcU7UBZraBVTCG+GUfMLSQdRvZq7CjlNzykhAoFFkeggsqD+hOirrodq 8z2FGPkRqa46k9GWd3KhdgGZ9h7zh+LboZ4SBf6tlTisVEk6xSuP8/abZSwTnDcI i9hI/xurIDTg00ji3spZ2A== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721qf60-6 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Jn7OEKtJV8aP0PLmu/ahlDHr3ABHS0Bp3r4mHiTL3EX5p73lH2+79Xm6Rbx9nT3xUw6QjjaEKx5K66MusdXm1Bfpx9y7t67ijby2QyP7Vkn0zWg6WVNmRU+hMcCTMUYlRtNpKBlj/nPj83GdhWGsw/Kvk8Uqx9tZ/BXw0+bG54nmCt5VeAIiEnlirJqVcrB05QOxy+B7C0W9GF3v6/iS48ityr1IemhfM8JVIzXcUJfCl+3kCWLFhM/GxZeR7bDUGAyunbVoND/2ypj3AzijR7kZPJiS435R2cDYrTNbrBeihAibarKq5JIsHrj6R2VinrkVG/CqwFPv8HF7T/155A== 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=cGkO58eckRNRtY2+d9knBDvwpP6NPLCOTwYH2Il57ImkLhice+TljPgPoGGQXhnSrn9FayHNv80+MspFPvjuhi0aD9+YK1fYRXCIL/vy6S2Tc5c2T8cYXH0VXQZxscRkJ882rEIXnWvT/WbLxuvQVvaGA4mUNhKNY9N/gySZEsdmyEzCrYzg5Dt2caY9PsLMa4FvJu+SSTcoGNRS/cd3xtVyap2NqesO/NjcVNWNSwYneyPg213O/F7jjud7KuweispGL6KNUtBEBYI8thcWqTDf280ROlEhBkedq+Xe7YMBs1y6ZDsIpDodjdijYsood724UQdrqKeHbbAZv2L4Ow== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:10 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:10 +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 v18 15/16] lib/oe/package_manager/rpm: handle RPM 6 non-zero exit on %post failure Date: Wed, 26 Aug 2026 14:45:47 -0700 Message-ID: <20260826214548.3002838-16-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f88684d-8638-41dd-c04c-08df03bb7133 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|6133799003|10067099003|56012099006|5023799004|11063799006|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: lDcvTmL1zEiEwtF3OFjBsynzD2XcP/qC1cOgTuFc+QjExouaEZCiXBu0S7mpqNoAkXhJc6d+APnXUK6JxR+4gbiKLmcGIXQHkP3mMBmRUTktDO+ijegu2Y9uAeVg4JgX0zA9nKhuh7H0nXj4QOv6WrOCFZzZgA/k8994oTolumLDdMKU4uk/IkrQz/9YuThmDgynGYXtBleZxz84bEd3q2V+ZB8/lFCYAhNTErSDiTcUK8//wip2UwQfOiYDkmP73OqeOxbuwrVBVXw2E9PlPBfCpTC21G+VS1H9Uy33aBxGLVR9OocwU9fSCGWGj/+wk0p1noJPVU4Nlpl+2QlLg9e6fKf+BlM5BDm3WbzEPt8L99WhvjmtRB3kvqP7Kchhb37ia35DCZhb+Yeb65cKlj16pibuwn1gjGnmXbXXnsEKO+S9fp50CWkHy4b9OVKzhT4ujzb2MwvDdPVRyEnMhcPTPImcfYt58uOkFYdk51ujPJhvgm7NjtRbsjdj/5xlaefE76YMM/nh6hoH6otPMD/+eOdG/uc4gxnTbzWGNHNY1P9WPLeL9yLZuxx6hYOtOZpMJrptCHfQCUgeaUYmqP9ZT9ghwcxbMy5O+BgBSZXdAA+pbTmcAgUeoTgwF0TF9GtjSWM7TIhL7hRU2CMVu3x47LxfeySITgbY0CdvJMh3HQ8u1tUnBscrq6hjmVOTBzqr0ulw6znf2UdB7l0Bmgl45o2Vp+ptlhG5G4TbQJ4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(6133799003)(10067099003)(56012099006)(5023799004)(11063799006)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8PLp9V5WnI4IaG5ncNK6CD9tAnOo0KrSOp0CM2tV0F8+7bDOf4t3PnU3Vn/AqchPplNP1BT3IQes7/3r3EK0UM92yNieWM/SEo5OJt8fvhpl/nBmhqjksk8CuB+E9e3I+nLAvaBogtbmdoJgwaQVjpOSW9YMeiE04ZizlFW9vapAnypa4vHEzFz9toDr2LA8NGSrb4ZxH/z2KuSwBFruYvU5DG9gFmVTReCOEB4Qdb5uScmUcQXDlwuFyxXWMPIHPxg2i4/rXJylYoFkeyY98vCHAbCwrSZ/gNeF6GwfRcHL5SYJCJEV3VBjDLEn/TIjs+FgFLX4PsxIL/0C6Aw4A0QByv4/uDBSuszk0IiUFl9xVyKN8S+fKgzHu78W/+rZMwuoWQ0hlIv76tipqEXsyrH7qhFp0Hl1N1+kr1Kj+Kdpj0rpYUd+XLBxWJR+GUcH2piDBOzD5mTnNHwxxGsMd78W+rlwctFjStz8tYbmujgfMvpKDgSQxGgZKdR6RZzWgwuJSTtKP4vHt1979NVP3SJMpl1ifYzjZLs/BQr2nCIRipUTKeIBkzeSb5Gz9gBnOVA3QQvF6GE2orkIX4/lHaoy8Bi0p2zMLGRTlWYUab8xEiVVhqSd6C3e99vP19I2m9cCxB6XwAU3zVjwW9z4DL/mP1PCkEcfOBgVsXh0w/JvZ72p8CWKXdQfbIkRtvZpjEJJNULkFBzvOoBKohZGtFCX2B/RpQXcE3gmkbJi1UddP0cSpGBKrdOKnceTg/87B+gjOfTjzPs56WRJiEfniGOC+q4kIYiwsyJb/AfpeBNwCZ/L2pfGa67jlSDJ/oyiYkgjxhMQ+pAo1H28Flaz/NRwHntb6JHVz78bOovUi0VCX/0eB/oli+wemZa2AuiY8u2IOUyZg5d65KiqtsgbOhsI7FidPsXDvb1AXM0QVxWHJjBbVSKsQ3ZQ11M53HmuvTlQvULtJKWW2cxnEp2Ur6RV22wb27A+fYprBv3acEepoXzOb3BdjnnWirm+F0KS4OH/llbfKHOmaHnpD8ZogGqUTar6GcKG9mTJKdxY2YNrP/oqrjzrHfvqxO+A+ezQFo40y+VzzcNt0vqwsU6RvIa64ukKzb9p5DBHEdDTDezmF+AHgLbkg+KEzAKOaIPCzSzXf82ivIYKxPgEFAEzlC3iIwhLPOHEcPUutuvtWlFgqz5BjDStshHm5i3I78ejQqH0CpiDb/ipqYgTI2RpdeZOzhH+3T/apzHyIeqam/isZardyGlbKHb7gq/TLvmknHq/WxfqS1Wm8PCqoVeml3JmmSuLOiHnXoZvCqT3oM8pnly/yF9aDAOxZBTbgioGy31ABnG16FxJ8nKdmiHEyc1GUfmfw0WLMtPqzD+WCpa9XneOCvJlNst0UxoOe8w6ZqUb2713x6ZqmTZ/YLDxVD7eCf2dvexwDhaL7dbwcFgU6A5OWE8j0Ae/v2WShfzUR3at5WBNP0tSSk9JH3QM297xWh1YYNxYW83OcCaaekxSkL56j6SYeEVysFlKy97dzI4rlAklqB2/TsPYvNF6ZPapwSbpthZSH19AgdUMR+pYPHtVPF/b5fO+AaOqSZrLHPY2fP6nMcOJ/kr+wBH6zY/xMNyGS03ZJ6WaE9ANvXZKfI9V2yFbj6FQ5JqbJkr+rPPm1uuW8utAbg1PYv3ApUQxZwwPgvlYN+pyLyObshDSGg2M0n70Ni0KHOXk+iK7+evQa32r/+/rE2qJDKfiB2gtJNHM7RF1fI/45hpFm1g= X-Exchange-RoutingPolicyChecked: fVCx1KnWEttndnMphBbKOlwG4jMEKF1ZBjAVvb5OHXD/1FzC7KcohvUkeASnVuHPR51eWQvcNkBW8fJ39/nGMXQzKf/Gm2EFNcaEQMA0MU6Ic1uSWfYZnxqwj4hy5BCAjJyYBXO4csGLXAp6ObEJHqV68bRXloQdI5d17nfILDMR0z3PlEePE9fEoDZ2bchBqOj9ZpCupJpyyPurRfDwHXYXD66Fpm4mlrseSHjQt832vqk1yc92VF03Q1/CYlSV7AODKsD4fhb3zvJV3YfnBezpRHqcdAJK/376sfTNganerAer9t22tQWkyatEgNM7KXbJc+W+CLqbEPGGp3hz7g== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f88684d-8638-41dd-c04c-08df03bb7133 X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:10.4154 (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: 6XfxxbbQEg86JB64rtAhRxfi0Sk7CobTFHfEcgJBN0C7/c4iOoONyc4oFKqDpDIJHYvPG8XyIaN06/LAtCMbrfcINyGQ9tzK5LDUttjIgTw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8f5ea5 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==: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=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=xrz2xm_XJy7u4lCe5tcA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: ZkIzNtcpClAK97f0OoiWPeuuk2MosyzZ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX4AI4hoDmnzhg yYaoeWUrTtFEFbbO6fJE6S2PVkPf9ZwYZ1Ky/uGAeU2ATkFUkIIIr2m8ZKlaWLaFWtZhxUsUwO6 ugnaOIwKSLNK7JVKDaCGyUlwMGkhgf29rMQOiKbcuEaeXaD7QEKAdZrZNw/WQTJxVNlINuLwp+9 a+yg4G/tc23dK9ah22Sb7YN9OKTFvyjwsU/UFoGL6sCQj1aRYEthXPaIwZ/0djyxvUYSBXMmOGo AIYs/UnqkKFihby28tTzq4tP4ZLFeDATbsn8myMKsb+TSbC7mvb0JlR0GwbZ4cPxLBzkbXNdiIu Ws+40Q+uPEzOMdepPfYjFQPhLbX0ORjixXVQTBB5SFfSxZ6gP2nA4V7ynchh5cFwxo5Ahdza1nR mO3r1aVP+6m1W+dhvp52YiMH3SLANtMrrGIo7KWp2B7zgc5eqWUIdc1eI3609VuaOV9GuKCzaCo 9ZJ/p8XHaW2SkM7SuqA== X-Proofpoint-GUID: Wf695aaR-Ir7A2lKXNGeSeS57OR_LeTS X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX+s81R9JV+nuK U9UTSoyekBcgfIxb1NurzGuX7tzuwBb9FGbHtfIkYafuGCSBykoqfawJGDbokmMnK4ga0Zge9FB dAilQ4m+vgtFuyaTerPMBYpfeGu5MuHw8F2URMYfk108oRyN6O8E 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244432 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: From patchwork Wed Aug 26 21:45:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumanth Gavini X-Patchwork-Id: 96499 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 F3765C61DC6 for ; Wed, 26 Aug 2026 21:46:14 +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.23525.1787780773918682987 for ; Wed, 26 Aug 2026 14:46:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=X9exkU/S; 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=2698f24599=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 67QKf6Ia410014 for ; Wed, 26 Aug 2026 14:46:13 -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=O7QClXABNFHMI1hvJj3gf2u/4mJM1DGXUpUkezZcGis=; b= X9exkU/S+CN2cEDYtnU77KWiamDcsx0b2Jv0XN5p+mQMhQqC3tHihw/lNwR1gzDW 9vbAHQNx5LcvZG+HJHWNzAWLdUL0L35s18ucRZKuL+8YLjZcCQ+8mchGZ14rdA8n fG776IcfP4lpeSMwZyR0ulSAGo/mGsJZgUukbvywUT6fzsE/FwMWZDP425Cly6nk io2rdttBTf+HRuFU3ZEWwJDaZUXiMW/cQ7AZxY3Hf787+Cgj5heNTe/lYCJXoQTv eSQEDKiDZ5jOzgNVyU/HZ/8ct/OcuaTtqUNvkHuK2V6suao9LKjcJUXVi2WdH8vA 4h+aJdatWfc3w7LNmVH4Qg== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4g7721qf60-7 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 14:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cjMQgd+MW32ldAaKY2A5acoPhI6UEedSWwYNJ0voOyzNBl7p9bFLz+haZATIeHK6d+c8T5eWN3nhxY8H4FblEv8PUFCqdrrDjDzxPdg+n2+CXqo0ASehkwWM2XJbwYIIxe4iY8FnAIcDYMd4Qj7bBwm6ecDe3T44KGIaCFuacm5rNb7bh5h5Nlp2KPjmhkXj3W5IRyyK/c1jvWIxZoGno1w5f8TaxZ6MdU/swn/lRTmN1/76+XlcyMf+ErdSyKKxtPpcfUYwyiNiKvSolhUQrMojV7KWsN7RGyIsytvFmxoYhQ9Scr4cRlxryaTDevkYgoqeZUW2fJAASw9RhOyYhg== 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=O7QClXABNFHMI1hvJj3gf2u/4mJM1DGXUpUkezZcGis=; b=CPm0hcNTcH5mLpZ7a76d/yEVImk6W/6Uoq6O+5H15pDwFnHU9Jzdgfa73itczfPpiT7HJ1dTf5Ck/41U/dgbD8/qoFSYIz1NlvcUpDuHn8zSL41xuAIVZteVSVM6eHheWjYJTRI03ba6EBH6qTu2h0eoasLs/0UrKr1BcTmHDb4icqG2te9hA8XNtM/hRV2YBnedWHkcJa4UAPK4J9F5eEbeefUpTpASgsaXFEZ9c1eMAbk0pbg25/2VjxgYjxGLwoWQo0QSVHmJcbnkhtIUPVFzgaDebnWQYzOdmYbpx04RoQXJh+sYokX0vNKPyG0HCnuG01BRWh+gVG/M45l4xA== 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 DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) by CO1PR11MB5028.namprd11.prod.outlook.com (2603:10b6:303:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.9; Wed, 26 Aug 2026 21:46:11 +0000 Received: from DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b]) by DM3PPF5EA507B64.namprd11.prod.outlook.com ([fe80::4f8:91a7:e7b9:874b%7]) with mapi id 15.21.0360.005; Wed, 26 Aug 2026 21:46:11 +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 v18 16/16] package_rpm.bbclass: filter pkgconfig() deps regardless of generator state Date: Wed, 26 Aug 2026 14:45:48 -0700 Message-ID: <20260826214548.3002838-17-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260826214548.3002838-1-sumanth.gavini@windriver.com> References: <20260826214548.3002838-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR13CA0188.namprd13.prod.outlook.com (2603:10b6:a03:2c3::13) To DM3PPF5EA507B64.namprd11.prod.outlook.com (2603:10b6:f:fc00::f25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM3PPF5EA507B64:EE_|CO1PR11MB5028:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ca74c0e-1824-4f33-d60b-08df03bb7192 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|23010399003|38350700014|6133799003|10067099003|56012099006|11063799006|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: tg5onoDJMbIkJWD1Sx39mBDoQtTEpk3LCqTOkM5TjXN2oS4EwYZ67WfSS45Ds3ZbgaGbSTEfZTcy8xLipgQFBwInjxgLITsSXCC/4gLmWjalTLJXqDoChMQgaufmrc8NLASR3E5z5PFW2CwolfjB5JRB7BtIWUaqtgMUkMmB8U4rhYHJuxzTJBuvIFJzB/R4E9gK2EWt/pED8fYyuFBrD1WWiFBNgdtkbFWEuEtcfqan+1RPCiUu2xBFJn2fX1xMwh21s5AO71+f6oNczO0sp/tDGLygRaugkMYTnGhF+8qY5XoP1HSjDGLrL2bPxZJCpUKTxDLwNEuCFWSHtnRdZViP5DH70hSOWnE5k1p+ssGKEtQJ9V5AEay0rqGQ+/E/lbA7v5kfAZqx44OFvelSnH2lduNDM8MsREZvPDBqTMCQMsYLtzCqwUVVhC0K0jxPr4wl5o6vBCTkPQay9ATo3whTmqGD92lrae6m+BvKUdy8L60WdrcW0e/4RhboQbF4xTIbpN6Pm3srCt9/HxeXi7zmHrK8r3i8xGbgHgaj2u5Dg1/76Iy9jGFRdYGSTTuGLXOU67LXAjvDRGw59kylR1jT+KQ3yMkidA0tJkA3UC0/EIGAjdz+kNQjQEjonbH8xzddtX3TXvM8CYrVswg8xUC//PvMgO44n4B+MJBlxHS5ABqBcwvECqb3V65Gu5XMAErcBHaZrZSDTa0S2BkK2V3GNP/Vz0n2/KT6QQHNeBM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM3PPF5EA507B64.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(23010399003)(38350700014)(6133799003)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CpuJ2PKZZSyeuJUqBCyeLT+mSdzsLfZ5qtq4ir2o5xqIC8TVwZRTv8eSf3lk71OQGWI679kb+0g0zwj/eCD4MlqFa2IOL/dowr3CdJEVScRZj+UUn+ZebUoQ1LXWH99zE4n0yGP2aDOCUrQ2ljPWpt2Agy7Q4lbQ07HBXvk8u+PjAs1MUtHzTX5qMJB597rNwRpqRcP3fiW3vvYz6pqtkCsB9908obDJFKm5axodGj5LVJwqLfdlO3Vr7CMe77kHd0/4v997UKc59DgjxY9KstMHSl0JPjt4MdUjfqn2+XxcpGy5i+fpNztqxKGLoiVdQyc79QuJT7zIdVOX59ET3wuCyetcEFe7ua9oY6bihjYIOn2P8HgRFskYVXxISU0KbcwyHyL4dxbF7azjjaA4oXTxQ1b6vLbUO4exSjfZiuoUDWpx3j8gCDFOeLJQAu7yg9mR3b3Vcsd9CS0zACaEQMYXnVMVWFptAbf6hsM9xbH14/HEnc5IeJpbNqWJVuv5YTlIR0JVKDC26LiQH5DqDGqW+7WLfD4ahLmBVW0Lb8XmDBN4L9GsYusL0vGKTNFZbHju0WqjO6Oeo9h1vC705zaDR/YpK+gzqjbsrc788V9PD7i+4DBLzANZEdHG5rCYvpjVM7y4AnnaFV4q5wK4dEabJ1ZNkGAdtc1NyBYxjSbJ4LxIzneQ9WH0746CNX/2ACyujicV/vVwPCaETgCit9gGW6ljCQ/25GBhBL4zkaLZ1VSCWhj8FY14iDIvHi0Hl6p6XR+yJ878qUAhzJQjHDC2VOViLsRxiOudzg6E4214N1h0j2WE3XI18MhZGi9pxL6A0ExdKJ2J85WtvXlIg5Z03VgEMbiJUmzOQnktY9B+G0kTZ9TV6RXcqwip09ZTJ8wtqzM7mgXn5sLANl5nJpp4oIEByP8qgv1kEFl4LGjC0vYw2ssH5k46TR6itRUlA1VCzO8ocI2NHGArD7OJKAo0h2OXGRogSC9c6OWSA5VO3tMpsMDHdVsRNplG9VcdxjS6JeptepQJY1oOrWEci1iM6waZPa7NmMVCf9tVbOIZCJnvTl5qun2557RmQu5lZYXoukiYv+wzNvC4ezKZCmI9BSlu9h6Z3J6MHmT+PFePSbZNaf0EKvyag7jNNF+aCcUPFMIMZWU4v2IY9gKMSOL11e+xYiYwAlk1WDqQVVlnS4w6dr54GR3DuLll3qa/BfpKSVdimrRVYq+ebm/xsyI21JFW3iTSTwORg0CoLnsFMdAxAdiQq89LxZKcxWseFBa/gkFnHEiMIVp97L0k4TP2DTMwIzx2z2cgC85btYj773OC1FEOAmkSRH2mwy760IRZ26ObotrlB9je7Ut6KDnv+FKDIcV+gpbiGlqpEB733u+QLdg2TRA4o46FV/ZVvnAob0sp1uCfr11Qgc40K2HZLHg+sBJwz1OSUR906D/OOAIlz05f7omVFds5nvg9PrTBZMTj3uYgylUz08q6nMtJBWqB8fqvwPtKv+lEG4NBoWBnyKeeogsSxe9r+6r6aLgE13Dfp++L8w1UbVcEvgkfhs94XKOVr6BhUdYCQZvITs7Gsw6wl64NRVl8LqhAMAw4+5pT7+ZYq/5ucNVOKHEqLZqb5oCTyMmizkOi08QxMQmZFwRQ4GJWh17LBlHhwznjAIidawAHuo9y+VyKicDm08WcFOeYciuw2VoJ7X7tCI48481vHeDCVMtWXWK5ovuCeMewGKWdmhgP/IR75U9cMcwR+8rIolqfU2ItyYk= X-Exchange-RoutingPolicyChecked: orxJpzWkjEEdEeDDGWYBfY7YLSd2d5uY4E4Z9fw3/Um7UfHRg9CwIy8e4bUHyzVH0lwsK5s2ISAEYixqkUrSz/0i3tp6RFWAHyi3UKeAi8UAeheqbPfwl+13ToNTIyvGF9UIa/WfmI59wZlGYIcNc80rBxSQXH1TwY6hIwEv5dZE5BGNorPTEzblBM1M31XjXJYUAZGOtlIE+on8q4G3d6BMVoTVutOpo/DND2O7vz8Ope1xAIgG44Q1gp2+7hW7HnQjn+PyGlnnCkHj32SjMP41jIuGHFHMryGKP5MoXqRottjjxTMycSGUTKRN2oeHGbNqKLMu0EWi9J9X7RMGcg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ca74c0e-1824-4f33-d60b-08df03bb7192 X-MS-Exchange-CrossTenant-AuthSource: DM3PPF5EA507B64.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2026 21:46:10.9971 (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: MeKiuHF2p8PuYzNG9tWUgf0OY4QaFfGT3GwtCDMdeNBPweOq/iWFkJ0nUmUVowdJu+McQPs2bauOV3qutGJ9pINaY0ntGFcAUaElkNX6QUk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5028 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=d8vFDxjE c=1 sm=1 tr=0 ts=6a8f5ea5 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==: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=cVPVwkwUeXas7e_06K0A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: a5loQoJlXYo00bWG27SBR_ez-ddnoBnF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX/O7+rAPRG8ab 7S3gBnwhsSnjdUZhqt9AZcNPKbz9tx21r4RxZpLrWFMoon/y+z/vZzOGRtUiwLg0NNQV9NMtzzM RiMFOgW0a6tSOY+aJ6XMUBI22O31PkdfaswGKPXvsQClNLaGy0RrdU14+UzaAuQi4tSu8NHblz+ V3tRJNP/oE9TyidIdyRADNV+B+zEOHSgZRKJvnSmxFfadF7ggmBo4wcTYptlOpmXWSV+MhdS4bW WPzmN65TuazCU4027rsslrSU4e05dozgzVChlukdo8WcbHEfsYvRJwocoQqLY0N97iKC6I+vCqv IgzfCruLkOZ+Xi9ZJBO35l5+vNsa0CgRQu2SZNcb3vhIoQdpym9I28f6MC6/qk3kqR2erS0VuNO HxQ8cJmIZP8UiSfZI/hJP3pW5uhiyvDFENlnJYfjDT/Pcvy2I5rrXrC2PUbHJXMLJaf2c1Pm+q4 SxVSgB9S2KW1gtQQNsg== X-Proofpoint-GUID: oVYTgp_0mKx7UFjm20GTLxDXuSL4ciM1 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE4MiBTYWx0ZWRfX2vJs+GkdQZ3h JknJQ6qubUuY8Kf/JBRQNcqoLzisnfCwHPqDSvidie0ClDP+yag5bbeg7HRiEJ9OvxMit4ujuJI whf/kIxYUxMPDiRsDKXJ3kF7R9wPQi9kSxB9d922ekAlJwUAl3Hs 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-26_06,2026-08-26_02,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-2608260182 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 ; Wed, 26 Aug 2026 21:46:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/244433 __pkgconfig_provides/__pkgconfig_requires %{nil} don't reliably suppress RPM 6's pkgconfig fileattr generator - confirmed via a cleansstate rebuild of hicolor-icon-theme still showing "pkgconfig(default-icon-theme)" and "/usr/bin/pkg-config" in the built package despite these defines. Most likely because rpm's own fileattrs/pkgconfig.attr re-defines the same macros later in the dependency-generation phase, after our --define has already run, clobbering our override. Add __requires_exclude/__provides_exclude on top of the existing defines, as a final safety net: these filter the finished Requires/Provides list in rpm's core dependency code rather than the overridable fileattr scripts, so they take effect regardless of whether the generator suppression above was actually honored. 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 71d5c5dee3..5a88e3ec20 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -612,6 +612,8 @@ python do_package_rpm () { cmd = cmd + " --define '__rpm_lua_provides %{nil}'" cmd = cmd + " --define '__rpm_macro_provides %{nil}'" cmd = cmd + " --define '__usergroup_provides %{nil}'" + cmd = cmd + " --define '__requires_exclude ^pkgconfig\\(.*\\)$|^/usr/bin/pkg-config$'" + cmd = cmd + " --define '__provides_exclude ^pkgconfig\\(.*\\)$'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'"