From patchwork Mon Aug 10 04:52:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94833 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 B41F4C5AD4E for ; Mon, 10 Aug 2026 04:53:11 +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.23264.1786337588514560190 for ; Sun, 09 Aug 2026 21:53:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=nv0HLGgn; 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=26826cd257=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 67A4MfDJ755820 for ; Mon, 10 Aug 2026 04:53:07 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= nv0HLGgnP+17H+w5OwMR6LMiP6/2l9TTSAVP4OZQKCpJkRbINRkZjzdRpB8gOLLj 9Wjvsj47RPfCZwc8WsZe8xIo+eqFMSkjoQy5UJ/vPi+d+ljA7Vr6wtNAb11zELiV pJI2rRiuqUaOOL8Us++RBPIJJ2q7+ASDC5OATod0I1Knfd88hluDr+o3B5+9rkNN EMIbz/bjTCKzs3zs/XJvBdtiaT+bH29pIPw548XLe6xnpqao/177QFwYGXtTnDxX raj4mf1IcVPP2LZS3++h1qN7vDs2hiENawas36v8CvSMwHt1WvX7QcA+hH74ZIi7 Lbyyt2OrGSnpIbccUpQGEw== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012032.outbound.protection.outlook.com [40.107.209.32]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwue81s4j-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 04:53:06 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vhw6g7aZ8dHhHb/MBqCU4wXM15g2SiYxIRraZiSU4aDsez19iS0pWG3nyma7c8l60l7wuRDGcDZ+SUq4yrDtbtJAtMjnFNL9t4l0yVx/fcCys5UH3D/nYd2a+OXXa2QUvJ0j3+ofhbEx3NsO/eSN/+f1i5TjwGmgcmVdCM6R5ySvXW8Cf0ZKfrTgwLywH4Krw+Qsb2YK+nqwYz7EHYcK8/5rcdTrKDWFDn79Un32Bu5+i8vgW6QnhnmLy7wHNiZ73Hiu+yK3Dj6DPNj5gZaf7wvc0MAUid5RuvZVcaOLmpqJxaot9ovr3R6ixCGzPnfs0lfjTCNR08NNXsXYEvNcHQ== 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=K+ZCGU1t2o9ZqWJRrIo26lnGq94KA2a7r/KlUEzpOa13mfCcE/aai8l+SMiVxyn5ifQkNIGYU+gznaKzcsK2VVIELf70uCSDPtiPsjcnIeKQFqp/DjiYO7k16cAo7ML/xaZeePcbiSonyev8m6xrRSuXnuTUzt+wL/lMhDsRw/xtKPwWER4xD9gqkXxo1/oW+uTMp4VY1yutIDzP0zO7QT+kkVuMg+Jes3C8a28kth4ZXN6NkLhHiPokm85ueQKZp6nz/t+rWZ8ol8+X8PS9MbW5wz/qh8RjIi07uXm9zkFGfT0bRWljSLCai+OkhdrA6/UdAuMNsGW4aIOZ+2owKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:03 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 01/10] package_rpm.bbclass: Drop external dependency generator to support rpm 6 Date: Sun, 9 Aug 2026 21:52:41 -0700 Message-ID: <20260810045250.3903576-2-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: a8b866a0-ccb4-419d-8b7b-08def69b42ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|38350700014|6133799003|56012099006|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: Tb0ilu4J+rKtJGD7jGh8QyHkvSD/STJuuZtEra/gsntBcBLiaNP2bIP0zB88ur0bZeREyoQQRPh8plN2+/5e+jxAu4DFWUc7BcZ2e+hZodZ76eDB+OZzyW9oSMkoUDK0BqeilbAzxZAXbyTI+cFLtK65ODbVW2DYaK74BgaiLYeGRiX5xPMcr/s/Ba79foSlwlX+hUMuYzOzxEc5eLw8XCimtyApZ0RaEBVwHLxno18abZfdk3WkZlhlZ+n2nGD66SuJOdmUs+nYHlk6SdR70GTQbMmNeM/qlE8fKsLNHIvUiisQMG3skW/yzgF+sphrpYLCVdXRzMet/syYSJbCDZ1ta9UWeOzzJEJFgIHjTJI3WLSjPYZ1BHdzBWN3WjpMKJ0bnAWrCQEZCVlDtQJr4oS4bBtlacKE7ZNIf/4mreW8YgwXB2GQvDIebKYeogdTWNSGWdBTOxmt3LqnA49ICk/vyzZWIj9QxIKTGhdn2AXq8TLwLPWn1+xcDILWTLVF0pnbLTNFRMhdRwRMsZ2vWa5xM4Mlz8Ld0q4sdyUiEJAJMD6QpAFpKj+k6+vQFZpsnPJU8p0SUohqzoM8jxu6oa6G6hFIsMbhNmCH5JfNkVw9Ba8fZSc4LgDFYPxJVcux96cXqvAGxP0w97lqJLlIcOkO+VaBaCrtBbxLS40xFThtlc2f4gcOBYggkx4ZcBmBaG36xiXdL4sx4jApIvJhKDUd16skBWH6OzTcgMkG7/Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(38350700014)(6133799003)(56012099006)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6E5Xf3myxuRzjkbw7OOe83Jx1zUsY/NLr6UikSEra6EA4pu14kyWeiUIgB5l7u73L9wWa1piy/FfZPaC3lC/LKyEvUNO0LFBPv4XxS6F83uwITRlHutQPgl0sQxgpCKc6xgr5hrmyDEulU9OyHS367Tt0ycD+OtGeS+Rgclhe17Lavphr+dRu4+HE6MMQ6TVTDHqGSA5IoO0+ti4Lf/kyt/RGCHqy8zUzP+OCnC/HuQ9zYz6f8kybudwZvY0yNAmnzSJtZnVz5YDCpqJlEAcTyhvDuqKoKAEeNladm+7Bno1AknCT3xXoAiDPoRxzzt8IgNi3uzIv+XdbHH8MeL1Qk50Mgv+IwOS+V2nHx+dkTe72q8gSQ+RhXvlu6UhgyHIEShzVJIIEK0WeA4mfeA6lhrpJEdZTQPGnmPC35eHrjD9HSlEpX/vvXKNfyFTsenu6PRocMsjq+x4kLji8vNPZ0nwNCppPI1KlQJ7q1898yefVNyuGhrfTZuWnP6Ny0P1x75FouHkEgbozmBnGJ4av0b0luX3i4pjkMRbMoJtHzmaZY3rfDL1HLwlLkVmm9eTAKf+K4ZOWadOTaNEOFQulikzoweGBZmFZojUgHmWO+cyITXjsTcC4KvvFzv14awyBZbVlTs/ncZ6J4kn0OZ7A2bdPanL54VPWbDIFjkUYloVSuK1xfJdeFG+rIlhPNaHbBByE2k9q2Jae5jnjNUm60sKSkCpGJpiIUT5COSzFTXt9KHZVzyhxCIn+TOHJaorVEPw2ffkHC1iPFP4qmZmhtf1S4NbwckTKTUljZItpzIxlP9tL/EiuENNXb3LNouxRm5a/+JVfk3HMRBfBkj1BDN5QtGj5p23S6pj906xHclhO0pNjFgExWZDMVbWQdAXvmOClLFKVj5ocKQuOsPvBqlNiKZqaziLzffo6Nmf+rC1lAY/PtaTYYrh6WRIciPpun0KkVqvxZRqqx6Gqq5jRh71tkQihFK4BNIKydTkt9aaMb+YvJrjRINac3vLadKBk7fGnpKkDeBI3zQONTOAfPpZrn+Xvk0UMiXsOc4s0UwLhzaX0sVHSIw/TFxEiu6pxwi54qdG8FJSvpPfGmII1I4M73Y8YCOfwqB+qPztYA0Z1oRE+pUpzC5kZ3Rj8LaiHvT6SgdlfuImJ8k3QT1HTXeurSQ74owPp7uSrwJwE+AZO6JpCFNigskaFmDNP5iPVg0574aDdGUgkTk9FX92MTYXxn8FcumaFtaxjKQGRo3ee8eDbacQXA9+oBOWiDBuSfFrfYFc7oG1ZSnwT/FhOvWJrlgj3TBOAGWSZYswHKbL8x6OL5rLTCLor6eEyclcbjl+bKG3SOx0YA1EVLJKo9iMY5NCj5RLA0LHlxWVIbqZ5WWoJbNWkIk6DVMOVnhU2y+shhd+Vab34z9S1nXOt+T4ypFHt1g6J803mpk5/bl1YhquXBDFIDU2HtROo7dGqjdkqj7XFN/hCKzybps/CT5NtNVrBBT96qpn6H/JjVdXJFjH9iQULz/fRO7vV34XHgPZRBkGw7TdNx29Oir63jao/s4fgmcJn9aoQZGGqJ18vggk/VJUOAcCALWLkHqXehJCF+OGv3nHrT0N/lWR253Riig81wb4sVVfkRvkeg/ZJ8v0v9QSuQAI65rz5DgOvWGaMozGdVVvkcuoRv+RfuLDNeCPHIsL5KqfHgSOsNsGG1Kd2a0wdQAsCnWz7L5HbUhPYuH7Px6KJrCCuGXJRBjga9+Y3dtlfdFshEBxqqc= X-Exchange-RoutingPolicyChecked: FF6Dt9+2kVhc8I8XK+nNABgnCc5Wa1RuCtvCA9tc+0Gr9vZJSJQwdcvQCWfZhl4d5mV3qPLt7uhpdw2WWeqSLNpGnBvU0/uTTlRNhLmIuOXGIBDYwqNI+zZyt+RTOfC6cWXu8nOCDEb0pxGTDgdam4aQlH6snkJLcfXOfMx5BSxDKqZD5bAII/YJb14/8LpSx8o7hRA8Sjdz1jlSgTcKU+FGkx6AkU5MJyGmF6Ag/Tz9/jzfT8/F7vUIWbCJMU702MWyUNkt4CPn9PDRdMw/o73lPV6dmxtrvY/qFEIt3G3YgWSX2792+91qee7fzqDyCNu6zglR67ukKkxqsPjonQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8b866a0-ccb4-419d-8b7b-08def69b42ca X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:03.5112 (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: p2MxW0M0N3hc0aGLoRUgzhBqK1/1/QGg3WOrXwx7ycKO9gy7ydtgZYmXZuChc8AS2+w3QJvFaxL74Ox0wcGpRuoelHG7ZREr0bRApZG1K9Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=A6tc+aWG c=1 sm=1 tr=0 ts=6a795932 cx=c_pps a=Eb813/LJkoRL1pr8t+D1ZA==: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=gH8vcDOTmKDoYkm8A40A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX4daw7IF5CU1b /ud/ol50u0wh5Zp0fMls0NA+334l1rgtQmUOLzAkRGSkmtOHyDPLeP/7xLFU3pBIWokESIntV8Y 3U0imfB+PcqVOoEXH+bMbvfPKBfKhMsayx214KCOhM2PXKfDqCr0 X-Proofpoint-GUID: tMxTjY2Y15DNjQaMpBA6BxXee9DyuwnH X-Proofpoint-ORIG-GUID: FYPRv6u_ozfTy9FiURih-EllKe4RYHZn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfXx2uSJcee8RB8 sbHBUfAGnDXDUaOWW/dYfiQz1NNHPsXKKiHuKcMkMfDY0TpWaPSQiWP3Z5Rwww6BC9LydETFKtN Bw4La2Ts6y7CXl66SxoHm42GNNATkoSwDUDjo7JcGQ2ebnJ+K8ck02fjjdrDVq/32aPgNNVJfd2 8gBpjGtDgetmM/IPqa1DOhlygFgriT3WtvqZ2jhxf/RLnYpo8sJhuOEV2918EtQhLbc8zii3ZId vcxw56/oMYyWHnRV3vBvTWmEcJ15ad/ZQgMFPDuHwmGwxlMBU4uuz6xfeqg4nUdY0uXQeMZLjrp NjV5DJDMU7Yc9wM39btitDnpg0rV7s7M2fKm0hfS4vWvBrCMeK10bRJ1sAiZ91VPLMMNLFPO8i0 McJR/7fwnmqsOrLfh0GIlFN8fzeZO+1kmKtd2uxPYZourogaMzSbm9R2E+RdktWlW4tb8SUAxm3 nTvQYLkALeNy2+x90IQ== 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243093 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 Mon Aug 10 04:52:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94834 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 EF60DC5B560 for ; Mon, 10 Aug 2026 04:53:11 +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.23015.1786337588554905745 for ; Sun, 09 Aug 2026 21:53:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=rjWqRvui; 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=26826cd257=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 67A4MfDK755820 for ; Mon, 10 Aug 2026 04:53:07 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= rjWqRvuiP/cTzO9+EAfllAoFJTosV3a7eEgK9Yh9X6Frc/5fDK4+9Z0ZtXHgn2sK fpC/qaZaIkCyupy8/GyoUCNPwvprpqQJ/qaE7WVLmDybX2bknkWCHHN7edMpClhz rrWN20uU3En/aiKrXy2TlAbT+Acr2b5G0XDzp4/8MkOdGKlYJ4Jv1hc+TyWxedZU 9eUtr8ChQOin3Rfy7jisZ6+qeksUJ2LbduWUB7bLXbBNuay4JoSfn/VtILKbsM3/ uc6YKYfsY8XiRsWMr3E2UvPH0wdJO44qD4mh7W/cuIUH6biOeYYo1cT7KBwqc2SD 2Gz8QXJ0cS2+OdyuFuQLbw== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012032.outbound.protection.outlook.com [40.107.209.32]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwue81s4j-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 04:53:06 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gaHGxQvyTRzslDkksi4SkxuBhikU3QhyuNkj/0Yi0Mt/DG+PZvN2WD11r/0D3+c0Zrgu1GS1U0LpxfeNdqE/SqYtnUhol+lrtZTszAgry59dmyah452pTYqhIeK+ycZcbSn8yFX7B32DVXX+Lx8+YMYR4wdPLG6YBnElpokEGGUXmZdfRUXzLwTAHVE513bGVSfacli6+rXVS9rqJbTL7TGJH1H3ZaijdDvUu7wG3wLRHtJB4DQIn0UGcOtey8/D7Mt7nRSI0sImyEP3jHEDSutUyxdxlrk3ewIS4MQezwNVqaxVL9fB9JZ6tslzwlvKm2coJORU39GeZFI/+CNKAw== 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=U+Sk6HGtWkLnTG1nDZjQAO1fPmq7aPgsaqsiDnQJveIgFQkx0koJtp1w94ZSuDwcG4wWP1F7GSQGyssPThXzYi61OZ18QKB1vSY12n8tzT7XtNImzQhPyvgBfiHhKj25Fohbel46tImRvteEuaBDCOHCwIg/WgLnNHs/krfFA3rS4oewIV0nW07UGSidpMxPXcMvD/0sR1/Bx7y/PqWG0XXI8vlvw7S2vh8wiOEkKR3lQDnw+ShRlSDZ6b9Qvy5KBB1p3AtIHlSPZsi8KyuqnKiQiUhXPbN+7emmUEPP91jIXM4U5qXqMwg6biGkuzIC6lxXBNmrO2QeG6Za/M2yhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:04 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 02/10] package_rpm.bbclass: Define _lib and _libdir for rpmbuild Date: Sun, 9 Aug 2026 21:52:42 -0700 Message-ID: <20260810045250.3903576-3-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c63c005-4e0f-436e-f25c-08def69b4350 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|38350700014|56012099006|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: bEV2/fXc+fxLtKsI9ECJ00Zgew6zmHS3Io6IRh6cT7H7CuNOcNVrNL+l6GSlHHBPZOHGPjxMZWV5oQixtPCTyXn3LDN1j4ioHCK/Y0B8DHcSqNr/6/LCbXfeJmZpVM0GwBzbApYedflnxyBpp8iXlghR83kGUnRZrb6FbZz99RJsG3bI633ZiXdAoP9i+F/Z9oNbCGLgnOW/J8GJ9kaM+QzlC9zyTwZSRWvhIuvGPo3fYJqg6kbzIc01n8h7HXAUtIADL5yEXhSnL4xtIgxCRfch/NLlhipHiuLjXmdquzUJZcbFDaA9j9xiB3FoUm6G9zikhHzWGKhDWiJ62gWksjPHZAA1FN7tGUL6UMZCAvN5648op66ZE1EivI/b4/wFfz9e7+bsgw3z3R7M5LgTUo0ki6V6ncg6ab+Is48pDxeD+qN3i7vwxPfBh8fbFgi922IKYlu5DI4Ksy6SHUr877XA7Yo0HJXi8vXsw7RdHfZywccSn8tg1BsukaB6mEX7hz8/UGEz/AqoU3zk3VMgZkD+acyAR9ynXpWSruSTdfqVFoyXF2gbk2Nsav5zzlw+03IAUVJKQBRT5L95/HmJvrqN/bF0mEuPSrhQXyRzc4L0b/dDUoSuLiTla/ehRgccgEpXG/8KtGsCZgWIfQK0YpfxdDqQVTldr72O5FSthZnh7c4tap6EupmBdm/OSyoKHPgU/UBobjUeac8wWnTI+rSZB4lxShD/Ab22e34X6QA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(38350700014)(56012099006)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ddtZhon5MBtlb4lXjLTeT8UPociDEKQ6zDnQV7IySXpwfjBzqjDUOMSbbmppE3CcLVDVPdQJVWaztfmnSbVTdu0J1iID0si0TZIlD35nMJ6llotI8HEj2od2y1upIgi2SFYScW4zE+dAJ+SJlu354LtXHczztIy3nGmgADCrkkW9LPRsPJraNTIt7rI73SKv/G6ehYr2iCTY5lYSwaqWFUcRvlq25DeG1New/Rwk4rUYF56TlT3LyIWcGpQ+aOz9o1dftDbQfQs9hXoSueOJKKlYpvPrMZr/nvmx5SUp2ErKTfV8uOTcRsLSJjjirdf58c/dt+uEWXU2UjbUkXBi+dm+TRb6UdOXrYVc7J2mZtPmAv6r7AZEcvf1m02EWyCbNBcJ/elCTF/tm8BEvkxSvLGHcBpSQy5pDW1QSDTLID1AwdQ2sb0yjWcEI3TIBulIz9NEQ4uaMm34yvZES5hPJbmtvKZgw0OwsSkDN/OWNfAViXwhE73O1k7xzjNhxkoy4V3g3QXJJWrmhlfFP7HQIe2Q1MByBCMwkotNBI+8qZjJzCTjOvtVAvtU23mfaRpLCrA55cOrdAeVvs0UrQKBBm/XOuWDKgzP5c3Tf0TjzzOwlMSjnh6Vcc7c177ubERmDwOKsBNAmOvU1lNVO34M0H5p0pvWlebeICq8Rxnl7fJXlxwLwU2gXNhsEXbOgjutd6vvLonnSVmXq4vgWqcoXsRHnkiQTa+yI+VcuQ/hDdqGyf9LTSs9NkCB1LVEsx3rJbSClWjcDE/60epoaXOPNWBhLP+s/FkYBV2dV2a4qGPfy1vm4YqnkZxpJDFHIiRWkKYBQuYyAs4+mHnUp/nR6MtIpRFM6yk9UBYbPUweHRz/z+vm+bBIHqfimrHk+GMW0hBzs5yYDeYoffkJl0S8AsMWQllygnZmfJnezApf3zRVbMS2TpEHzziqL4uUbLOyrHadrSeyRRV6L+xWotQ2NtfSD5b+L4MZ5n+PQuAtmmX3LReNwUkjw+UxFOyrnISC7PW/5yNFZ2OWjb0TQAtEdlL1OEq2Doh6AiWI8FBZvTLzyG0859WtYd5ZutsC5C3ES8YEAetpANMWvlfUeW6Y2nyJoqrRAqPnEUqMSDPbtT/7tJss4jeosVDrmmC+Ejrn1DdVKOTCCdWc8DY4RLYeqcqmDaFLGM9pBCMbkJiK16lrhDafjwi3ov0yWloCLuW2s3qFqhmIot3iFntiE/KRylMMFNlE6ttHgIcjc+ot/2cXsJF37KURZ+H+xYS5hSmSFwB1Zq6bEhJsakniiDw8ktrkDxrCjtCDX92Sz+wE+vxC2LiWAvSNYDl38H92cQ1Tb/q9LqUlFVMVIYhdq3gX0PKXUA+vN9rYPQotiuWLFWUrGkb0zrUJYhGTY2b5C6csptFD3PmvBaI6wO+8dZq2ljtVxxR4LzogfkqvMvAEpSZSZP3iBjRACB9X4vBAwJ/XHZbADJ7HDw1qkaGwomGSyryx6cr2S8jTdHDc1XqSbd3VsxP4rwcVrt3mDd+xPOkz5XQOaxrWlQExQkQ5s+j0A9YTBJpikzNigyEVS3w17ShFc9jnS6PD9AO0Nwx1rVLIeeoDWqpNVJvvdpOz4f8Tv+D5CzXTGQe06X5HVFNJlejxErbv872feh7VL5h0h/AIwZ8HURWXejKVq7sl38w55atki9KpsJY4+SXwiGFeJW9xllBcAdpVwqk+gcxiHfK5fEiMSSzgGJXeSoqs6GaXn1IpUXTTzRpwJORof7GnokY= X-Exchange-RoutingPolicyChecked: RHEUy+8HZmZfyhCG5NP+JtdjZ+huEYvatMJKpHas11AMfZ9yhZlkG0FiPIuAVFNaZtWV2HMxjiOUJB3Bi5NE7RjkEnlWUsQxYWGf3/iwkZxhEBetDLxxTL6nDR/m4GiP9zrJVq6hAW0BYM199gqUMHYhLGurCfrRv6SbvrotLkTICos5A16rkaM+5U9uSxQq82q8VmIZXeSVAkZaJVr/CyvpGV0zRFO+f2JDkU1TScSJWN6p9mxLXYLuVTdUfZoGzJkOQUDDS5l/ljOri71pLIDSqsqcXrzICqsCEluLWVB2l/zv3IStUjhmqfYvHnzs6pBdTyRLBz7zFpjDaHzIdg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c63c005-4e0f-436e-f25c-08def69b4350 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:04.4134 (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: BEKLs/SZS7E+yyZ/xhFnakO1TFzv8InBv47CvpS0w1a8kA4HT9V+dgIvoXmWrwq6AwjEZHK4M9UEUb4iAQPkbE7rUFBtNGsWKBjZIY7UwQ4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=A6tc+aWG c=1 sm=1 tr=0 ts=6a795933 cx=c_pps a=Eb813/LJkoRL1pr8t+D1ZA==: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=uhQZ5Q_QBcnTBNJc4ooA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX1pBoCgL2Vpco Ah7X6YEYjXIUA0sNGAm/+XEYvBXIgMjF8zPLccVMDkQx8kH4fItClzmggC+YlvbtTPrGvUm/OnN PQUEqA6EbF48G3MHhKZ1xTTBVChFXtSTKGnafHDoXxCjmlkbXbwY X-Proofpoint-GUID: NzQhI8EJRZuG75PYkUpyM5FPKGThDINj X-Proofpoint-ORIG-GUID: jNe4X59xzFsGBMIG2ls6c9HoH1aOO0mS X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX5rNXmzQV9t8L udjr2lykRr3TnToZ1Qj5gBQ4dqRWj3TZnG5YofY8dtgJAU5kjhHft7Qr1O6WH1dROahhKbv0BKG MDN2/+xSYRZgyD6SivMFo0pzPnm1Ps8bPLwQIje34YPqFT78x0AciWOYoFCpprBfD+hENOZoaET fAu8uFUnnQCkLVP3mDVrC9QlhgFdmXdMkSKlzsBX5Lgy/57jlmn6zvrrjnPkk0sxns7/lHWqTfY zOR8I8/lwliwH6aqRgjBijoyD7dMGgkgXbes5DhqtuIaLHL+vam65mkfqrSmtjnDKkmhaEGKvNl NWuGzTxCTKnXbjmlzE70971oLpLZcxN+fMLTzV0ur5+AAp/LiZz+zff8CdzFAA5CIMo4W5EA/sq bmgOmnToBplMb/ojoBDjCbYC9RUvPlXFqH7o8Rg6yCnSQK8xnwYGkh6W4cJaJCtSkiYhoJovil7 9B+S6rKA8d/5LJYvxkw== 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243094 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 Mon Aug 10 04:52:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94837 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 D26BFC5AD55 for ; Mon, 10 Aug 2026 04:53:11 +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.23016.1786337589065399176 for ; Sun, 09 Aug 2026 21:53:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=THvt9135; 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=26826cd257=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 67A2dsii582257 for ; Mon, 10 Aug 2026 04:53: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=ChkSXHBN90OlHgTVmPukZEsj2cKzcbqwXqvI6ioPI3s=; b= THvt9135kjP9VXukmz9wqWIVUR4hxa+ZnXFAP486FUclGp5917/4R7Ca0Kk5dsiq 9deQ37Anlug1Mb5HHU8TqfnN+Yg6LCcjzmnA67VyPjlgl+gNFHOKKm0QgFOMwGKi 5Y6f6DfvLKB8aTxZU3ySc2DThfeQocYT0sKREbfvy3MBkccU40AKdFmPmkuoSA5w knUAEmQOiJ52pav/Up5BPlW9lAjWll1/1i+GWgwEwsPyBO4PSNK155jnc8Nk2kPz kEYUSynMQanp6wP6KsLn70veGxxulVqdHd84P432G8LRXG2ZQu/v2c2w9WYczVoR ceNagihUgCie+wF+I2hq/A== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012032.outbound.protection.outlook.com [40.107.209.32]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwue81s4j-4 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 04:53:07 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MMIWBAwvFkcyD/r5ONleX9opHJXZ5JxnJ+91h65RZ614m4sVUTkYvBWL/wQeKTi5CHi3c+IjXtZJRxvAiMEb6oiCGmvqcz+hsyhnGflIuPQpeBq8z+MNFmoJOb2MLdTYZkUXujtxQiAX4RQOE1BNeN70MIjSROjoilapQW0y1ETlzyk8l3JGUvjfm8+rBnaEn9dICfyZJJjKF2ZXucvSDu5ABaMBCgyXzGs9xS9aKToHzwebdL4KZ5jC3Umw6K7TLga+HjvVlZ/2okBeIrX0DwRaAdXH8+URseVcFdII1aBhPw0yLDyVj29BXGrMSlkvof96gFr6QnX7FM9sN2Wz0w== 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=ChkSXHBN90OlHgTVmPukZEsj2cKzcbqwXqvI6ioPI3s=; b=m7tN7GOISgZy910621k253BkLrSxf3z98YXGFJ6xd8u1Skfy6+8uvlM6obLlKu4HPgfth9crpJcjFAT2cjsCx0Gw//T34FQQ/jcEvT+2rqGQ5yuK0AyMDu9heioftFAirL76g1VIWhDX3aq+X2+cazbYcFCu6MA7b9bGIfK/JE9scqwdRJIV9eQeMCLUcaAV6tjjQDf3Ny7TNz2s2COwSvLUASR9fYLArgjLr3HfzBBh3y0WR5FR5wrySkKOVtgVYFTKbR8f8uQ91QDUzrFqgiIImph1JBU9J7u59plUznSpXE4qxTbFTjcgxhs20qhind7kAVqQDrhgQaEkORE+/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:05 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 03/10] lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or musl Date: Sun, 9 Aug 2026 21:52:43 -0700 Message-ID: <20260810045250.3903576-4-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: 611b399e-e01e-4f0a-d7c6-08def69b43db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|38350700014|6133799003|56012099006|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: /jnOy9xT8tbW7aI2PqSD/dx0CmhbAhkJeLawVeQdabqz0f003RKeMDqtypJw33ZitGe5L4n63LQvUGfHxZYgHHTrSDwEAsYYAb9lzKK4P1VTJeJ/0qgIOGpYQKKxnm9a9C+R2qaj1T33NT2jax6IuImLuF3/u+SR+/FoAM9d2C2/xZ9QCeBeFJ0pJ4XMnnh/JXEwylwwfD82toeQwrJH8GFtmAm/8xXRkXA2HhXQVkNvo2IwquVvs26mYJ2XXCmcsuTqjetsA8cFDdwCpfGsOVG8nCJatC4x8U7hTVUVxxXzAQZjjXRznXSHbXXUuLyNoCdahL8Z6Up/fwrbJRLWFscabfbl/BGyM5qjH9koa/vi0xlbaNywQesJ6A72+rnabAaNf4zKPour08SYL2ncBuDZx19cTOwYpqozcb6bD/SaECHjXhAMNyl3YE78mHjqwt3QzfxFICdl8lQkVzLQLjP8jrrUL+CxsdK02c3MKLV1mfxNnRm6LzZPHugVxalKxiTnaRJ8JP3POD/CSOJDaAIN0C+zcvl4N0LU+GlBX/JronELDpYsBj+K386JoITHIB0b8owP3JBuPBK50ROfiIAsbZM+jv4ouvN0RUzTZojR5T/9CxviOl+fb0x1jAca9yQqWe2vokkBkFYabvFYYn/SpzT41Lz/wY+xqJxBI/5kevzxhX307bJVnuwg7Jr9iPJ+NimRSf7kV+hM/AesJMsUXnsZU8S+xU1A3wzJfLc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(38350700014)(6133799003)(56012099006)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GJkzmD+L2no6b18FnGXdZpIdfXwuqf0GMLCU+alo3yZXLkSgSi2rtzWwjeAw9/slKjh297aGGpLiJJx0DE17Nnl5HUYF12xOhhSsAjJfcmgXs+7WpLGh4V1Di5k7xf6Y+diBKmFvFE2tGFpF1/bjPuATR4IatDqUi5zXFuuDsDo6I/Jg4CCQJ07Y5w/UDl0y4ctckYfvjclraLi1cFeqEpfxPIUAK3WvdcmDuQeb1i9EgqcMGxxPI8vUOrGZKlAuJx2r5NUZ4+5AzLc13tVolgD16Zv6b0zAv8S9HsF0u94HE3qjd5S4Mjw2AcWSbOtplgaOmNg0O6fW3MNrdsEmHL42S9whn30Vu0Wxu0SsdpzM8lyCswgtD5L1bw0hfk+5AIF2ApGIQH7XeveP/Q20pdlpEP65hwRVxhHreSQPr8hP2uXWKok9B314C06IM95FcqSLnuJpJ44QbftyPjQDzjxu+SY6ebHoW0LLCAU40ea1NswcWuNmJXy67zlshJL/FnwcBcUjEEaciAdFDhxOimHgBnRjfEA+4gy6E9ZxjiTbxRfUYB1nQXzn8aorzB5xOMzNxyh1qArVjF75VFM7cwgs3s81m+YEAx1q0rYJRKMskDPQKp5/lePmkVoox0km9995j9XL/7jOkzD7Ihy11ERxwPYPRzYF64MukdlgugE0RJdY0MEuH5sMtB+/hoqImblIBg09zagWXySP/paVqSeJbxiIlGb+Iylm2oqg7+HYf9p6ftZIijylGxSZfbbEDKV6nIu8LrBhygIohhKmg8FlCWGCp3P+WCv5xBsZNRPFDxiiq+L+dA4ykb4ZQkUfbyVUIUV9KjV9eUzLAOcEkiXJqnQib0pX4vVJV8fIQJ9wyXzHuI+OJUJC1f7jMYUmCERd7cwbhfARm3a0RxZkOEnh2At7suk/UfcPRC4LWQcvEVeEmaAF/BmHqxuZ2/F9dZlwNGK2ggczsY6OlxtlWuXAE6dXOguJSxBOK1IZx070mNNMg0vFbq0P762dXlV3FL1SZXwNn1fa9HgsBnOkf8YGkxTJFPVi8pglSu+m04j8eHqUNZw0X/JmUml5DWyaYioYp9yp7C9MMvpkHgogsydtRK1OoXrPGip5+KtgMzOYqMnvaCK98oTuL2t0Iqj+JDd8F31Ro9BYovPEivDkBkzMscS7SHscMCKxFlXlwpUS1Td3Ir9WgV/il178eyINvN7y4tW+6X4y+jaVc+nsI4Ari0hpcYh012KPRAAqui1UCeUWrjm3k8XJQUo+prxg/x8W0zRgGQMk0W3Yi3t04qN3pIplLUVX/qxQnkATin3imP6Mgk8x55d01XMKH9mxaKl8fBAiZVeJg7C4zR7HDbwguSkNmkpZfDItIvjc5Oe0u3COHsEp1SRjo5yr8D22R/Oxa8VaYv8jG7HqIY0wXkhjvsDqO7xGJbZglVRarUIbxXYVUyF56LJNPKwDhmzuYg6OH79doHNSdKpBLi7EklTj/zAYQ8+CgtFWgT3ZqzMqyKUSLKCpxNXVLk8kQ1ujVugVIGqdaRfbe0RCuuM4UCsMRiJfc2ht6N0yyIuGI2C6aMjXtLOKp1KQ2DoUnuzuxg69YdIRlW/F0sem35meen6gImLYwPutvsgkVXRGQVwZflM2/+HWXxbKYsgLJmXAnH4aazqZjXmS1j5spfakcr88N4k0Xw6yiyMqf5SoZ/jfcEslsIfO8BvVzQTVt671xyqfvPyGzcXot4cJZhO75Ggye4zUW8Jsy7onH0ZjcMc= X-Exchange-RoutingPolicyChecked: gF3FapjsKuPNZ6fSOp++XcctVZcmhLF5XOIZQ3nb5XodFifIN/dRAfPcvQ1U1yzVvPj/pbX8a8qVsXve3g4CJPlWBkQ65yT+s8pEYSfO8v7wBsxycsJ4pQ5CMmXbRetN8J/SRczP+DizjFrCrV29CA/zhGWf323Nu9EzAwNYlQN30ypDhWm0qsibmFbHa4C5L8SQMT9+X898cLGSw3/ryb5y7e84eGYscQs95NSiPDbcS8hPFcxtedPG0EfezoJWexlUX+S7jRApjcjORMATdziEJaYVSJpLKAeGjODHwjdOYufjVuYK7/aDKEq1fQTH2X57WsJ8g3lC1you/6qViQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 611b399e-e01e-4f0a-d7c6-08def69b43db X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:05.3737 (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: d3Z5GjiM5fKVD1L6kmtNde6E2KHvJ1UhRq+gVjP3gjMDg3m2J1XcaCNSslr3NuDTV0I9OckvEjw4KdE5GZkasVheiqWdsZOCzp3HahBIoJE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=A6tc+aWG c=1 sm=1 tr=0 ts=6a795933 cx=c_pps a=Eb813/LJkoRL1pr8t+D1ZA==: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=YcdC0ctDMGJcGoIPl8kA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX4ojmJAOtb4tx LMDEyxtBf7wVmPi4CHiVqYWDmZld1xdWVMT7+KeSafKcI+ZoP35hZwOd7HYZ5J0t4ZiX0xnKYw6 8rjjddcy12I/KANQKRj5GDCXPtdzkK4LXzhlG1JndVg38TKCdskd X-Proofpoint-GUID: cVMG11R-6WjetqqWpJRktfTguTHF-FBb X-Proofpoint-ORIG-GUID: 7-arIgZkL3GQlcpozXYmFNIgtBYTgtx6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX8qw8cWmTL5zu XsZSbyH62y95W8gU7vfX/lxCYFkdE5fKx8zsIFOqK+QQaCgjUa4MDMYPV9kGF4gfxtPUe5wHUIc JMT+SuX4FBA1+blEfefz36e1PYuiGLUzZrYqhoXxoTq0WKDrqnZKwy7sN3QObzXmIJnF2FwPhVI 0DWDjt1nVQW3EWE2Huu0M+ygOu+ipuJquG213pINGjmuPO9WQlk0R/BzBKH3Fmn7m/lxdvv0qB+ UxksuM6vYC5fs+W1B6HBolhbeEfqWi7cD0UOkZ40kAkBCqCT8g9/VOElCKfuJTBG3AST4zUztM7 2BZlCcvfwPGIl67SkOHyn4jUq5QkutDeWNHXF248vy/TqOVl5VWwYh4hAhccb+QHjPTU47vThoi DyiPjD4dxWh8fokPwcYkiQzg6T4TKk7RKnlVFiIlyWG4Ikpd3frI8gsOUsuFdUgmNbujrLCA2w1 FM6TjOf0XyN1Fax8lgA== 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243095 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 d047e41a78..8ccd89a190 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -1853,7 +1853,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 Mon Aug 10 04:52:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94836 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 0E1E3C5AE5D for ; Mon, 10 Aug 2026 04:53:12 +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.23018.1786337589871703473 for ; Sun, 09 Aug 2026 21:53:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=gjnyEAAO; 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=26826cd257=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 67A4YSWu775995 for ; Mon, 10 Aug 2026 04:53: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=4ntQPVOd48AJ5abFxC2AGkFC59Olg5pau4BaGvPLcKk=; b= gjnyEAAOld7LqRl1yGdPs3oqZVHVRDZkqdMO90dyVrlGDvD8sk0F/qmJ2I7DfksK YTIXi1laxPELOe9c5J2WyiiM0oGQYooau4ybmBtaRVOfxT7GDLr6buxNANBXR0SP B4zjNkS5S6ii5DMb1q90lh+cocZK+lEPhB0f83slK5IRnSl0GTSlEbkCKjsIgY2y 5fCfA+WfW1HTPFEMDJUVZecC5kdKtyFZFTbd2QVAuZsTu/nvbaf3N+1ZJ3vc7l28 LmChWLB+J8qm1AlB9foQdzbill+8GpuLOtRhtb0tXvN/SffDXccXyizrIt/yWrvj qqP08Z8Ys/2o2szvL39Jwg== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012040.outbound.protection.outlook.com [40.107.209.40]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwue81s4u-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 04:53:08 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yaiYO12KP6LRLXNQc4z7H0f3QF/jWxb39vafyxAccGTPBhExBwWsaIlc2S08HU4MmvjlFf7RoJMCcRMr197tqj7ELOdLPrlrLyLBWO2k9YES7Z0v27qqGN8rAI5BnZd9QrPiioDJsbkqCp4MwflCKH0vhoY/uhsOmHyCIh7ZAwehJmGVBKE2JMY7BjFrq0OKgowfpwsNJqPk0edAUNGc3TqYEMJYgtmij5PFX/AYDBfakQ8GtdjCiJSgFrn6aSl7gTgqwu90goA+gurQF8cY9Eu1XU0zdGRN1kMNTnfAqeHfW2TUNosiDiYbHkPtTbzKzu7Yp8K4wuE3q61bxhReEg== 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=4ntQPVOd48AJ5abFxC2AGkFC59Olg5pau4BaGvPLcKk=; b=f3uqohp0dXLYWwQR2cj3xNsUhicpuOy4v80pFFZDwVjP+f5DPzqNd/dxsS/N/Y9NlQ82HKb/oMwDy36nmL+gc2mqsf5yFH/iQ/qGpIoMtfTd5nKNgJUC6e3DUI/FwKoQa7Fs2TrvQahFt2c9GD+X9Jrqz8igBVSyd0GWZCi9nXqxZaulb5ESclidfD6/JxT5m/E1F43nrcoDq7QkNj6JCATwK6NDCj+90+R2MDh4bFlq3VC0mhGOeH5KLHUhxssxeguxjzBciDOSqPzEP5hOrK1M9x3sr5fhb1itwvlG3OLjsDUrswHFtIMVGJmUZyHFiMwyeb4YQ9hz1VOIeninKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:06 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 04/10] lib/oe/package.py: Don't redirect stderr Date: Sun, 9 Aug 2026 21:52:44 -0700 Message-ID: <20260810045250.3903576-5-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: 96ec2384-9e8f-4fd2-106b-08def69b446c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|38350700014|3023799007|56012099006|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: 8c1ppYGFaF27Cdy4YdncbqrWoYYWeDN911hEeABJWL6V8D8RFqeyCfNWyKuLOojmCqOpZ0czNvnlrvcy/zrN4xr1XFa6Kpd2d4xV85n+OzbuUv4Ys+KNfKU+pUS+66JbDofAaHoJvx/zSCycZnFF1cjv2PEpvRvYfiIEZ1xFSabQq/dAooguJJhcS2L3vl7NEVk1VqL39kArZdFnR8HrV5c2eJQDyoPjQg1vcCwWbZccQ5LuNtDV26T89xEPgp21kf+80xguAPvry6oaF2Lq+i+XOBozu56g4QLVGR3KcxpUfz34ZZocNdOQxLrwtQ7HKh5kq1A77MT8yGLyj4f5oInsd2NMOh3nE65rAaTqTsk55iNESp4idznyGYcLyc04N5pDM5faMJSCuCmZ/+GlWQRKgXmslPbS67bCHUDEQqyQ7KyDHo0yFJPO7XJxq2/Lx+Xu1PDvXBdAuFpJnsPrsf8q2J6GtZH7oosgjNSXgTAzgbYJYd2w2Sj8oXhQG5PHRf6dMGhaiorNXNa1/NKbLSTRgVk1AkLZppLigC3mLTjOU5c/PvDlEHVcwyMrD/fAjXtXAixDoHCW4ylfOW14lJY2WNJWubHabVFkovRxHiqpr2k0CoBZ6959u83orlsA+6KQ68zzdEhqEWiEQ4ISh4cCUri6+tW7dhuKsxkhLVczvY5v1AwieqJnwv2dO+IvaSNIgfQWcuhgRkj6E92UQCngkNmY1GaKlnpP4PU4mmc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(38350700014)(3023799007)(56012099006)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WWmNyPN5usAixYLX3tGNjMHvpVeqB4geFTBOsbGW2P7EGH4lxf6IuzeD8vZTuajBXRpr5DZw7B3hq74aKK9u5taKBv7izql1iP8YadISxapI1pHbuUycmodSY7TX94x+7Omej+0aNVodZEsFhx8DZjwJQT/BVRhdGv+RtIalY5kvpXi3rbsymX3lmPgoAd7mn8jXbjKrnI9Odo9vXmJ8hioDUZQyMHk6+zDjn98MwqiyAgQrQLJ5nXPRRSQHnYP/v/PnMNHJmWrYCAy2YastGMvmqmP0lKhRidZL9ChzlmvaGNDTYZS6k5qCGZA9QIBpVcGseQ+5UA8/mW2Xr1BQxJWDGpk8NzDM53J88kY4+DPYuJNWFvCS15VQt1x/yeQvljAUwmuRTP0kKS8smYBLqzvscGkaAjqCfa7gnxp0cRKOOk25sd/9y613oeoyEAoS2GtECg80wJ1bL3MNc+4jMiseQfbMhR1wAaKbHb/FcVZ160E8c2lpoCxTgdlHm5YhCGjrxkeuhQFr9ILVtt8T/3HKGe2kpTVul87gmBC87owwnR7SAi8I4ysew0rVcGx/ITePB1+RhAUZgYkyNW0AQWIDQfw47cr5O959DuL0FlFKRUaXOub9dwwKiyTar0kRK5lmGenVJHErcUeuIQXB8+nIFmWGnaFsyzwrDzV11P+5MN5Rrnr/0ZShnqIFrQBIUTFMTk9MfYHsjccRjjW1hOIdLA3QWH+metbOvuAaxteDVQoO8EBTSZQSefhDk+7tkH0vVQcBtXgZSnXblJUg7ew4jUpqViyCy/xaTaqNAgm4PJWWmNTR2VhjQjB4Tkh5YS1sKKy3Ur8wCEwu2WinYVpLj0Y2vaPFzugBB1wsSzjlqVEhT86pjmLgOZOtCKQTGjHY7LgiU+Isf6x8p9HEFLHHUNJ43Ya2dI/H6AMQkuqTrSAp8tnLIexy3uJ5Sl4kE0t4zWul5bV/XHH0fa4DVZtVLvJEiIolE64+A9SOmr79OCLwmLavMqNDx9yW4UeykVPmxMoF8YEXOmq6WOIcbzZSh05gj5tLpc7iCEOGJPg4LWXMZaqI6VqjSJ+jDgFbWkgnh1/6lvwVzHbeyV9JKxk9RIFGu5Eq6rLz7agStiQLNgjLCyxNLqmhKzsiyCPgDJw6yYqvP/3C5trDL8AyH1/2JtC3VfbOvWsdVE7xbj7ndmgBVZfJ9e92bqjRJQLMWb1qvNRzv6++rK3a05/tzZhLdicuMfktUSBgNEiq2rBZ3/4kMFpA1FXjzOYM8qqebXnXKwbHb2kLDyNNQGGi5toUA5pHfRqXHU7dIrXCUm9k0UwgTQcH6VDeaSU/ma9cyKZXlNmjNmBfPoPg3ETQ5Tk9GKRaLilQDRtXPtji46ANAJ1vbETbmwVtEtHkn7wjW/tlDr86hW+LMRK0do4ABgMAIyil8iNfsgo+vY4IbgHEXIA/2qPkX6JGfzTSBon6h82fULzA5doVh4bfG/WDRutfdSVgWjJ0vFsIgAeHJ1O+K8ANPIdlerZVRL3zHYvxr04xgQoeeogLHOGjMwjUxTq8dL4k/rgLmhMUk8uwoVEiGSnjuvKrIVfjLrjnFO/9J8D7gOLR5Qcfha74xJHkSmhUwEL61CzpD9YDCuyddjQgIOBOa7WXxi02QjHmUPpS1zWKuooOS6EGCykHzzM9IHLgWw/AFiEjYPojO0Wm4wqyKs7mDgEbq0a5+ZTwXeSytzGrPKFGIq3QK7bcbVWjOrJV97hPgoGzYK2oOK6JGT4= X-Exchange-RoutingPolicyChecked: GNB4/UtvaZmHjc2sUhrNa1I3aXHmPwP2XN84svAkvH+omAD572ReV2soJMDewGX7lUjyZxzwetAfJrZ7fv6zC6N4bQ/o/f6y4B9sUolpKdeANo8iwM1xEjTwfoCsGT3SaBbRyDNB+Qmyy4GsJJfXBNM04MLKMBMXQLejia7soSPzW8/ZWQ0nQdZ4hnR7qNwEk+atBXQsDUaxyrdouhV6GQ+0XBZ0c9oMNblvsgZ6fmDdB5CwnajZ7SMHedhFLKb0tX/dL3GZ0o5wWSB5V3Q431Q3jLfhE1BTBLIpkWEXEaq/h44MlE+K53aMs/5zOi8eGMTExeEmyr1nf97+LS1T0Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96ec2384-9e8f-4fd2-106b-08def69b446c X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:06.3397 (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: c8aTsqm5sb56PNUG2D0o1CWbLF688SKOKz4LishZ/HVhIrpxWxlg8Qt1W9GOV3Ilu2Ea7wWdGQ7t52Lr+0ITzKSCjClTgiLKaPlN9O24458= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=A6tc+aWG c=1 sm=1 tr=0 ts=6a795934 cx=c_pps a=n6quz47VtcdWtWxmUgX64A==: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=gZyeYKPtWqWysoXHKEgA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX1qFrdA21U/nU 8YDLKWxVh3e83aBOrJChRSOWf3h+xdy/ZuSC90GPF39weEzUiyOHo8NECylscbfHPT0ZKw+dPoN xSLzmqbUqYt7YxxjoECPYVAlrktolm3cSs5rSdAgaZvYyBOfsT7s X-Proofpoint-GUID: 3-rYNtjUPNLTootKbUyW35aCX9YT0zZk X-Proofpoint-ORIG-GUID: MhNX9uGk0o5ZDhHc2_mDhO6LcaNZSp1e X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX2mflkdl1v0Tu 8KCDw/Pjt/Tc554Zjpbi4ca54wyvpUiCLBkH8z5D7u5qamtIu+4kg9Llf5jacsjEglceHPZAHkd a3FwYjRfY1f2IE2dFg+8D0YKxXWV3y8owvlwtSwcwq/cbx64mc9te3kKryqhlXdgT+411H5hfLg g3is08waJvnq8zlGJ1ZeNzmmBNoZ9pxAL6MUOoZROXXT3GznvZtqellgNWXe2HgYRjpfFzCZfhb LNOC5WBag8j2AQUpZlis+KTf4HP4vPjbXw6AMmN16diG+t6o0hC6I94AjlGY1xKFYAUWxBrMTRB weMvulBrE+JRBhJLiWcD/Amn0UxLTbAg+vhUjJqwCUU0rpTd9Dh1E9y1gHEb4Cey6+mNhK++dsn o8mv3rpwaid3OPY0/UJznETb+umJgUJmqn0rnJGqllNH1F8BAi2wF9ET1psMW4OBgGw/Bs9AZXc TcgFpqr2Zlh5+kYqMZA== 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 suspectscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243097 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 8ccd89a190..d8862ae92d 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 Mon Aug 10 04:52:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94835 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 E195CC5AE49 for ; Mon, 10 Aug 2026 04:53:11 +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.23265.1786337589824859987 for ; Sun, 09 Aug 2026 21:53:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=bcgmGI45; 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=26826cd257=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 67A4aL3H988538 for ; Sun, 9 Aug 2026 21:53:09 -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= bcgmGI453wIfMx9kWMcZs68ykLbx4k3phxA3UhXoPyFLeX9J3QMfpg8uV23jBX8+ DKYOjcpznTH+GgtrA50LrzVOaulUpYe1ENdjNnOdJ4WyHtyNAFFYB2ufCPVqxhJa DNnI/XzR4qPJZcL9gTvaTClKZFSoPjABQEH7xTLVTj+LFg9l+bPThx5s6m3MgvdC sDUG8/mKPxIclPSFyCrqH0CMvWgb1xW4Iv+rnbJVhJ/ZiQFh/f3lkKWXd78N26vy dcvH4OFDBQFzeR5SXVkSBxs5Gk0H0X/IpyRU3c7g6NUBIrLEz06Ap3vMc46mgu2X 76EdzH4Z/5+umpEvaacmug== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012055.outbound.protection.outlook.com [40.107.209.55]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwyr1smp0-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 09 Aug 2026 21:53:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q1HWmgsMTnyZXyzuDy1RjMNjlo+BAffPyb7Nio6L1YdsfSAjTNzcDMN5gbrvo+Y4Jq90O8ZDSyWYSJHWgXuydEUjcUW/0lB7BOY8n/u1n+F+1vl3VQO4lw0erD3xRCQQglbo9RFZOE1W4qDnx2Zt8rPZCiEMLMhDUdBvlaelfg34mE+BVljdPDfJVmI121uqJOX3t3SlVZ59iDSbXJakL4WJBz988JS/PGQ3JKmqioGR+BOp0TsawWeV8CiBqqt7K0+USzPzvotadvNpbOXCWt98bIdQQYr5zq3bwWIvCAaLXey4F7dhJnLiL3RXxmbWLrh6n7dHUJeZgj4x/vl73A== 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=MVETmCmRqs8cywyUGOu86/K8oRgBjmarbjiSaF22ZnVxVVwIo1JLta1+bwAIidC9ywm8qPAqq+MyAmCwcgz+0x5TToG8AZpi8nnIs51UU0p9Ey2pwg9vHIDdKF59vSRcQ072lsXrxLFlER6PQ7qPxcY4xDG92Ij2WsnxrKp0VcDetaZBPwcQn2Z5zGuD8Y8QjeHivrkTWpQCXT2FG7w6lWJeH/brSstb2yLfysV0hnFFjMp91CDWgUyG8VihOHp2/IkMkWduzmaVPRkkauIdrPmA8mvXvrOVfndVEdws4Vp20SRkOccvzNQHCoXR8tKkiVCxZJtZCzkdDNnXQTBjvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:07 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 05/10] target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES Date: Sun, 9 Aug 2026 21:52:45 -0700 Message-ID: <20260810045250.3903576-6-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: d2000726-fa9e-42f2-673d-08def69b4508 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|38350700014|56012099006|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: YGdI9pCpEqch6LaQsGTJonue5zO3X6PK3qpNH1lrP82PQpXQ1uWRPeFYzeEtiw5DZSPWRU3tEljOFgWJcCYch7mb7C2/E8vdHcnpTY8UZ3UFoxPvJ2J5fuJacas1mztnGW1MISJHP+5NbVGsQUwRSTorzH5yMjrVCRjieBOdwCzQUOVDbqgSUJGSf6qvFUzCkr7HNj0zGF2zf16B201weVM6l23F1HkbBsuqu9T2AVHgLaNCMvm5gITU6DFtRQlAZscrnSu/PsFX1T9Zqkr3GXqIr7ywgXfPgvlxU17Vlm6ZAv/Ns40dLNdOG6TFex+qgnARsFD1FcodCJ1Q0Pm1hUWXaf11FDrhR7kMN9k1QyCUPCb9+dXn4RoC0UgSX9zooum8YtydFHMcEjpzR5r8UbZ9EUHWtKJpBmJZnulzHy+QN7lmI3v3WtNAU3qTkgWlqvWw6gDK4TeyBf88A1aHabyIfVyNSl1ZKze//YAq2PjspmGCU7lNrWWcSQq7uMAKaLws99q9zbMhQ5R1wwMsZvXa21qA761ZtpXxUyCvRmfQr/3QHeTh/TqNkp72sTi+sGdJvotGIj+agmR+XBW9fJuDFjurQhDe9tjl/8a+W4mZOp+P2usErM5hevx9M0ULQ2c9/eiViP5efd1O6WiR216wr7xVXJoWURKNtahZDC4p1pahABG7F7ADteK1ikjqpWY4GWDAOEOj9WNZ2akqA1kgl6wfmqIM6QSxddacuNc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(38350700014)(56012099006)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TVQQy7B1m2yMZYylvj1cCbgbJKsiwJxZkXHVaar8BZp0L/AQAgtcVf6jvV7VgaJ7onbjWor/w24/vBBNAPKPnt+d+KUxLFv897CYG5YCnp48mAmK50Ix444rTdSYylzpq8hL8Qm4CdMCp6cKhdPVQSOJE34PMUG/pFHr3A7CfmHWssvsZfKatLTYltMRHvkD5Rrm9IhPBdyuk0R9OXV4jD/ekpSPHpE03d1byvCEjsK8aFAeYXohfQm40jiixhFazzgM9JINv6I+OCFWOPbBywn7lctRREpbpJp8JUzCrt3bdSydw3+Z+ryDk/H8nU9SJxkNRwnOjpiVPBy38bbuHSkIobTBa+lOOmNsd1WKnXYUHIK5/gQFq98/XiQ+mYngKSQgG7Brt4cOUr73OtrsLQg5gntyJvA7926wCaTAcJGWE2luuVi3PAF0HohAGLFWPjAvR3N4xOA3bYanrZXmHsAC5id8j3AsetXwirB83APEP5BuK8jk5Gb6R0g4BBXORzcWnNEWiFG4khiv6y7lM/8du4KjxKz43tPKelaa/9IdGpcFqOcKP3RMHnkFryV+RRM/G8d5vwXIEl1/Lqe3ulLHtbiegKwHT9YdCHEiEgBEKM1Zg07f6p5oO1Imh8gEyGVloUMlCMki48rpTDPmkc03asLko4KRlt4Ug1KV4HggyaicWQxwsx21c3x5DQEpi3Cu348pKpWDYMrPaF6L+uE/tdRMhd+NXJXLp6eG+IP4j+tSoqxluO6ERuy7WZxZEzCPJCv4Fk84n61EInpp1X5kFQNd+QzrimuGmi1goMDI+51HiukGeoH0TfiSowL0oXxwrgMaK5aZ2Q//Pg4dDhimZthg+mukzuTibnlSOCwsDYBaMZpOE7NKtE5YF61+4PT4xXZfuqAde6CFGNKOirwnESOli2jdaBv+VAaK7qREffM+RRrIVqSMKl/2L97DoV6Mqug6nxqN/jBoHPz8Sf+2ppRL4cTAv/M64OdpE1czp3y5BnbuM7Hy9UcIfYkid++sYfcBMU4WjR8liFASfE5K1wpVN+VM55MJ8WpIajBeCwmLlboAdBpNqRNqrEUmTl9/U2O/W/ejqYPZk3QFDL0vaBsRtQWEx/BsXByY+9hiy0/c3LETOOQfbnkvbtbYC8NamgTiHUiHkRTuLidAx/Dhsrz9+aPRz0BCvo7VCYoPJO9slPakOepEu0sk4WDKh4MEqvm1dPwqWFhf3WXTSBiS6osHeaqLvgiHKmgxYnpwJHPfiyYUZvn7xuTvH+eP6BGuvvKHOLntVTlh9ZSj6t7qhsQl5LxbUDrWwiQeuoM2D1KuPiO0nh8DarXpwARRGZOLu5ZbFYRc8WRG8d5FQhE2det6PvuHGrhvcapLvVOzgwq62jFiKM2CK6hoUFHJwEj+G28lWn85kyhXT65W6qYDG9UrjsfnUPNjP6wKAM21TJhghojtc0xSlJp1oeWv1i3qz378N6ui23JbFlDuCYKp6AaXahkaQYjMABOaz564AbQTrI2+/+6Hx1koMgFpEhQ/KEImwLYByaHH84ngV02+ThL7NKKJ008C5ZeYnhd4/Zq8fbOuDQYbo3966L8Ol2idRg3vg5F2d+1ASUXp7W9a4VDbRi+UzIFwkQ/oZzAlNBHkB6Vowi5gEKDI91XOJnvLD1MBlOIaHtflCzjNFYjPBig7wsZkEy8+X7qt3bIqVc8s2efIIIg0eZmvhuUAAtAkkkyecm86tEdRPALf1g2znsvi6mLxpxojx7APlys= X-Exchange-RoutingPolicyChecked: kRNbTLXK2bal3M2IhaIBkaeO4nY260jRgzy8PjsfwlE/ZIzQf3COQfas7QuxyQFGA1GCS2t/X/bigxz3ux+I/q4jdmZGKCaATPizP/DBr1O9WAQ1mVpMW1BdFjNWPcrsUibOOEp3/c/ffVT/pLOlAjX3JEgRD3nAK6rMZgZh/CjQfb43OVIu9UtMRKMY8mk1q0l3cww3hml675WwVZmxe9R2pegWXfHEMu02IM4ERkGaNuYG89OomPz90F6TUTfJh6GCpoeU3t8wqv6L5KszuJkjcX9GVnKhYaxxrh1ayBGtvM2CZpNgWim/hISOrDvPFFntvnfVFtFbyJ5eezUhrA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2000726-fa9e-42f2-673d-08def69b4508 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:07.2503 (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: O8JSLSNu39d+kNwKQbgEZfZ2je+3Z1n1job6lJSkCVMaCnOyLBoBl2XOXf5XY0jq5HikKuaJyKkOzCd/AAPAoP2S12o1iZEbVRcQHORY+gU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX8zlqsSNPFDgj bagbYYu1A7+5no/6R3KiVh1JJpijzVfy4x/wgtbNHwmowm02VWB98kIO66Jj2m86eP6dWJCJ5NE Jx609G6yyd7Zh0pwNdZSXRWviOrePwPKpGPW4uKDkQfN29X6phwF3DWV8/HR/ItJsEf2Hk4c3qD ljEPZiXYBeYNQ27+gpW7FNUdqRu56/SMgMZ8oBSWha3OVL0uVqTJZolMyuH4MK6rRD5cYtGdl3s E/TQEU70ezgNQNzZDR6IurLs1n3uLjGvHPhRQ0h43URXT+sVRfZoC0unQ0em5iLxaRdCcpoJMFX C+oSyHPICdU/c/qpSvyLYIU3pSK1gepC3q8cVItp3PJrKAQSXMh19upNkJrDD2tW96LixU+bVW5 pU3GeXLM8h30VCT/NeYCnv4Zo/DY8U5Tw9ja2FQ+yewl3ziptiFHhomvFATQ0LBXwqizkueH5Rh uOezdSlmrPRuBOEXaLA== X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX4no/1WWl1dxI Y2+rELu4Q2hii7qDklVkssjDrU8ZNFFUP+fkB15oGeuJr12l006t93zPkAwiKZoFKgPiE86rM8q wuYDewxx6gQ5h+YvxGKxdJjmGea7J3omF6wCsNuBKLobo98N0xKN X-Authority-Analysis: v=2.4 cv=Z5Lc2nRA c=1 sm=1 tr=0 ts=6a795935 cx=c_pps a=E7iPWXAsOYqR18yzHj3E3w==: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=lZurfIDJcIjVqGklx3sA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: aWlOsUBT25TMT8IrszDMk4MK1jfpEXD7 X-Proofpoint-GUID: FxjQBVRP8kqtsTyKyNOeEX6boSFCNqO3 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243096 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 Mon Aug 10 04:52:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94842 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 5F29BC5AE49 for ; Mon, 10 Aug 2026 04:53:22 +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.23019.1786337592250024602 for ; Sun, 09 Aug 2026 21:53:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=U03FDv0M; 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=26826cd257=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 67A4Fsof1184487 for ; Mon, 10 Aug 2026 04:53:11 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= U03FDv0M/IP6lowoGCujUUrD5IhouvepGQ+yjUvr5uKf/Iul8554QyUYBTKDDEVz NheuEBEMnpAxMDsnZ26897UXyB4insNSLbA54M1IeNjLeN8qg0J2Jx4bwfmSTYdS gd0aVefDtjAQXcbDEWLgirsFMVPMjw0f+vY9NyDUlacZfg3LnpLvHcGAnnLJCgI1 FyKYkNpQiJw5tlQiJS21TPqLlfzGDWQXdIv8/P/vhDsLbSqchO+j/wdX+52bRhZg naaLt1jfDKYsILGWcGg2Ex1Q0UUDGVG7v1PiL1TxhDvRZrd/Coa8zd0raofgpQYj xMSYtZ07HLqY0tvLgllxeA== Received: from ph8pr06cu001.outbound.protection.outlook.com (mail-westus3azon11012012.outbound.protection.outlook.com [40.107.209.12]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwsnwhv0e-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 04:53:10 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=elqMRs7PhCG1oVXD+Yn3bj3aVMUdnEzbDIBirrgxm7gFaICyeQAyJaU5mh08Pcq4eWBERzPzjLv8W2Or7FDmelRoKPbtoJcAB7mg+rK1AtHZL9/II5z+QSeSQ6qeH7+zpP4LX40449oHKICdkWEVvqAb8tHZYLXOFjvuazJjxltDobIE/zjfGVDUPizi4hJhmb63TWrcyUX/F5Upvb7DqWMWokmT1GBLxHFqXkvgT18zQAcDO0HAavzm5kL1SK4GtDBMmwlzR7n9PrG5wBbpkz1ouwQuyWfHXSVLvbSXcywW7zZ3+i7JZBXBXNdcP3T1OTb2lxiChW3qNZ4ljTgJsg== 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=ZCpLknFFjxAx36837rOBjLa0C9CUDt3YVlSh/G5fzmtQGpypocygra8HZUugboBTsPbTAAzZCxG9DQSptknDXryyybHXSTHCSK3SEDWB7cojqTza4pstjGgr1+fpr3co4VRqdqBH6WOhSB3PkVJhkyPUNWC3+0Ckuv1gZSnyz3PjMOr+6ZoprX68D/bTKGgZ50w7lZjEi/hRnd9Vyju5Q0I1SncP0FQLd8iNeFYYSMVm/WEqSFm/36U6ZTNzwUsA23HfkEWj/nVH45ifogMLTCm5kiCiqrLvsYpjzZROgOoB8UrSaOXpVUswdk/TpyHVa4z6UIttPt0ujwMyk9iBvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:08 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 06/10] rpm: 4.20.1 -> 6.0.2 Date: Sun, 9 Aug 2026 21:52:46 -0700 Message-ID: <20260810045250.3903576-7-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: e6ddbdb8-9249-48ec-049e-08def69b4591 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|13003099007|38350700014|6133799003|3023799007|56012099006|5023799004|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: wQL4NxC4rfUCnwkLqHchIAQCt3ceyHbOsoz1E/8u2D01PUvJh42tar94+ODMRIEKEGB4mOBgfSPt+y7fKUOLPihCIF6CM3Jfv968WUvvyCOHYzUsQRi77+xYGou+tJirriWADkxlOq390O25oFIoYkeQ/YSA1DKJSR5qWlrPL0fw6L/nI+zE8WKQpJOc8pRzvO+7PTMlAz+K4CLDjPty2b/CSCtifZ5NY+GYssyJ3jWYers5fywgYtdxWkOzSZtFiSx9k9upSqDGznZAcA/nSUettzM3y1KW61AoJ7lz6Duw6i1+vigXjUcMWJhInlaXaMPnYTdjBuv9z9XyA+HysKx8ZzDeCx6uG/gcdTcxbVMZDNVSLflTOnafBR6hGG+LmZgvWuAUbEz6Yn2sOVpYMzvn+APxe6GE1QA5ySE+VtwNdbd3A1tn0ntQTJGWtYw+qc9X4t2LwXOaVK2PTH52i1eR8SiXeCyfzkOEZDdmUl+dfltC8jnfVONBFkrf7MRxHElNA25kHGCJDfkWlouJoQ3/pZlvnsDvzwfnhHIIC9Uw564hM1nArdM4KYZ/A6AmHrtI0LGrvDAIit2r8R8nqo088P9O/6OqydxuBq6w2eQ0SQxhXPZH4IOcwj5Jyq1OeY/iBVrPrCaAFfu/zpDyK4wHmmikSjI68zbQd8uZXnI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(13003099007)(38350700014)(6133799003)(3023799007)(56012099006)(5023799004)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: d+3+NeRIIWx8LRZb5niYIWgB+QOlNMka98u1lvsLuqA0UPAeO64AUlvinyA7N235xLvlDDWlNkvBWPBup+NnIBYf2bLYhnaHWFmrTzCrvianUkJzPd1LZrHDO0Ky9Uub8BcgWRiJhXNCZ1FLhxSveuAfeAgV44cEQ9INbV/t6j/kJQB2MbZ7ABTsYrcsd5+z8DGZRCSg/6DxZjbczll3UsZUVNZHWUeBOH5SU+KucfcyIgB7bJnlpL7R3Ee12rydCMUxuSQgLZLSCWEMW+Fpmtx/X/qDQKRinrSrhJuvm0UsSEGGVTV8n2LwLsa6sxxkP9DMQnfFp45wMBPKZxNE2f23RLG6nxuCBHOH5hHLDu1JQZS8S6lyghAkQqujs048rOxA2tSEKbXhFPud8ZV2wPZz0xhA30rvbyCjSVhwtlhlSKJKBerikw6mQ6C24kNGByKE5J8q6L41LUZk+WsyNjSQRDu9XpH97wrjOXZ3z0zyXBKIop5n1pI7UXP/75Qtro80MUU4noH/v0BmRYZdHgxLQRsgKBy1Rk4jEW2MwijdZdtm1pQUjWS0sMn4EDP6GmaNPwT9OluLjRCZjr3DdoICAgtuMSpWJ0wJBhBRd+UtERRtqzsowSp5JNDM/3PPhkE2r4knEodEdkORvx8Wc5uRtKGjM1tsglkixDHtplPGp45cZRJQWvTD6Y90pxQPxIDAIq50mm3hc18o8rR6hTO4SHkox/S8FPmMtdPVsOFKtrztupfsDKV40vZPeG/JjURzWETAAYk3+zkP7FBtPhkNE5n9I/jYAukUKWjDWkHiDjr0mAz8wnFdRCiBZ2raAEarO4/E2mPWM6tyO7AyNUT6Ei/F6aprywrQ7tnMQsFTSb0FxJkQeAhVhlbQZTb68xXbf+dSRQkYjkoSIsAC1Mzsyk/3awO9UmVE2ai9N2vpfQwuUer8N/fxdFgZ6JOR0m8FtwYeFuMGbBEVLAZ64bo+gnVHST9ymuU0RPflRLRdZ03B/MNsLvhpzpI/CoWBL690MdWjV2Mjwo1r1IP3F0MVVGxSEbKPdnJdC1xH7/aL8SsY6PVl2BvduHZJ+8x7/uVhPswaADOj3lNag+Rre7w9cVir0U0LOVlpJK8LIKMzapPGwM2aN8+GnNSc/NwKddAlMh2J3RSwp8wxMNubMwRVZXCSPVixszAQiKHGP19+DRVC+1+YmmmMG3XObTwZr2706GwlNCuFqiKK7K8lORQwTUKpmL57y0rwx0xR28L6P6K3+TXxmQqjrW+IcJZVXI/miVhPVjTpDVInuh8XlzQWAi6DZ3Gyal1hpGBtlv197sFhaDxTdeO8vMT3yQKIhsejVenyUYBzO/2klKN2tYjKoN9kuT4Sq2imTjIpNzniTngiW6HLGS/DcE77gK+Z1lERJOOkIK7SOpMEfswWkMn1FlGx+fgnMXfwY4TZYqcyLfJHnXIsNHO5+RIi1CjgFdo0/8v7+QwopYqxPW+1SfzzpVFUoUl3pcwbELdOQMVF5PNEAZP4at9aKjUaFEVljwEY18wq1QETiRiLwnIt6HcKcHCdfKq2PEv2ftPBhjSw8trqAWt/FJS4nPyf2VcfWmHDGelQdVeMC4A6cikSSVQbWZXra9NwyyOhgtrfsSMj7Sn3crU5R+HiQJQAukzOzkHwcqEUfWYtmoK8DFXisw4pj7SBdjAchTByJ1osf+1nyfraoDcgHDG0ehTOsAKJrNn0kHnhAeOKiZ8fZgKCgaRO+ZjZdVgdsgYYrCePx8s= X-Exchange-RoutingPolicyChecked: Huf2lvASUhSIZNhPoa7HvJ1piz0E55uaAm6MjzQCSObNuzMUGSqVNX008OBU++McFI/zNopoubn0uChL/l5k2Oh+b0RCPImeRkJCxkCE5hr/2PrxLpWXazsdYiWlJZH3TunUv1rMCR3jDeCD0qq9/FJia8Fxb8ORjNj1R2Lgy2tVhUWqrGuAVyMDQkO+SCHrgr0s41keMXH98q1AJc0+Sl1QUKFjiejDJq4XKU/N6uF5Jaemc7J/EachkeVUFrEKg2rAbzk0eq+0A8HGtBwX5wUvH6TbQl5VE4dGanTSoRbHX1EZqExuneilsYLxLgNCU7ldVm4fIh9nDhP996DVJQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6ddbdb8-9249-48ec-049e-08def69b4591 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:08.2302 (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: aCi20nJdxl0LKpI0IVSlSmBIorVlKdPb6vBmV8gsuak/PLJzm0pK0o8ChBQM0GllfI+E4TFO15pEHDJtpe8YUlyv4qzjuQayMUAqZdpL4Pw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX9ym1gFVXnh3M bLuIkIZC1BrwxoWSQW9ljJK4x7pWoQlkhFHijNcjKJZ9bAsF35fWPNO3S5CfXn8K1pnUmCtricz 95NIpH+RgbCAKzzS8vGV/Ywru2ib3bYpqU11lf7x0r8hJafHH9Hh X-Proofpoint-GUID: ldeGq4dxegG5J7Z06GHd2B6xoP0zgAbR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX/Y8u4HEKpaXp 7V8Y6IFxQ6wJzsWc/31qHrWqdiPu84SE70bgrxHydG+bP+rEpHmkAwnY1mKE7eDQSIEv0e+/AVz wivaxGCp/Vu9l6ZskLcYVmM7jLCyhtKijJRX7i3wv9sENXEmvR53hu6/fjxuRZrdrPEj+EtPMj4 KpQxkOyxY72UAQiU0m0XR4D1l0kmMHsP+eWOBng73GO18lxWSpUrZhF/EkWbcznM3cVlhsHJ0vI vuhNNnFEDtMXPttEgmyYXVhf1z7Yagn1klxD46yMntFlS2HE0FjoAM3UaPk5kA7Fv5i/6PZq3xF H9PVt5VCOMePcqjuzwxeu8HKzLtGy2MzXey1VNwhW0YldV3KNRPAOiwLNWqGjdg/34WHgoxNsO2 pI8lGcfUuu3tG4kPemtdPYS8116es7my0xTPDBvmnw2bsUfqsRO4vBUESCfADqJzSSebf3tN37R py1nsEc4H7F3kGrzEMA== X-Authority-Analysis: v=2.4 cv=ZZEt8MVA c=1 sm=1 tr=0 ts=6a795936 cx=c_pps a=ul7AMzggcqKAecwK2qVOCw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=klDOsUkWDRETUCZYPvoE:22 a=NEAV23lmAAAA:8 a=Q4-j1AaZAAAA:8 a=GMGn13PZAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=Ia9td_k3mc_TV5fArrgA:9 a=2yX8oE26ukr_L8MB:21 a=O8hF6Hzn-FEA:10 a=9H3Qd4_ONW2Ztcrla5EB:22 a=jIF0orF5dxDFSsn8Ms5I:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: lvpo7RN1cgt7STBA7FL5jlHIxp2-cEWn 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 priorityscore=1501 bulkscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243099 * 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 Mon Aug 10 04:52:47 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94838 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 4886BC5AC82 for ; Mon, 10 Aug 2026 04:53:22 +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.23020.1786337592442990372 for ; Sun, 09 Aug 2026 21:53:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=MgHYBSuF; 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=26826cd257=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 67A47doW1046466 for ; Sun, 9 Aug 2026 21:53: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=JrCVkaQCThn4ktPZv4nW24GkQZSTvCXO1I05CqSMaK8=; b= MgHYBSuFt6hFmEacCNuHirlg4N1jPiupEGNrf6Ia1/1VklGTW0FvVgiK4s0tCAT7 B2K2wbYvBGDWGL+qYfBr/YtIMmFPHu/QepSuwWLeLRctsgej2U++ZZVX39PqH6fi Avwvttbt72KBZHi5z9uRyNyzsHoZfUeXr5Qtv97LXIbWqqOE5UWhdTFVw1YQZv0b iYrgslDnOXrHj04arNtfQj3HrXw9KBrIOTBRZXJm6ijiXssNG4fRk9tWmqeLOO6O 6HrcFQe5D0E0Vn9CPjKJNEQPekXtn2VUItFnNkU80Ou1daxuLRFz2Kk1+0F8tj0q C/YLNz3slzleFkzPzQ018w== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11010056.outbound.protection.outlook.com [52.101.56.56]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fx3yehf5b-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 09 Aug 2026 21:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CA4DShOjf5J9IxVQ09qOqrd2V11n0gYrCykD+IMbE7M1zrp4BpxR78VQdYjgFrCEhXbjTIXwrM7k20E+z4E7r4RHZgS5mDQizEpc03KkeB/FyRKk1/Gljft+vHp/gmjVPLwZJCEkkVXVtZLAoR2gfDgvdnOITLZQ4MUVJeL+4+zz4nrdAaSZR1fsS6dpvkVBfrL0h9NjHIv2u8bnDKRZQQu/KPbOln3s4VxhhLA4PEXv4cwPE8jZGddg///GyRk2RbPFzIhak6iIclAM9erbiukP0VtbfuGTsbp+LDleEDpNOJaWIdVpaFTQNGpHddol0vslCst11jld3LoemwnQww== 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=JrCVkaQCThn4ktPZv4nW24GkQZSTvCXO1I05CqSMaK8=; b=Nn7QAa+6PjkfEWvSlr7Ij9mhQWesfP/E5KVeQsthCoLeGPsYQmIjizESvhHWAPmDPHn5RT2RD9YQq14iFWaua/+/iJitQvV0DnJFsFrxPzXWNXAQ1Z2bueMGFcDac02g9hA+kjBOJhr9qGohEGlHeYLw8tA3OEoKTqnYwkUmUwxteEufnGlwjkLa3KvAoNV/BfxncJfhh3Fds+PmS1Zx2OOjLENtx4HahHJPqLRHQEeOa1R9sEJ/37qQpE/DRSnZE765KA+Fia5kzJqzd2G400IfY2v/+ohn2aAtaIIEgII/ZkADx+3vm8Bcvw/UtF5nkpQYdcSlXFESRkd2gtkFbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:09 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 07/10] libarchive: Make it work with rpm 6.0.2 Date: Sun, 9 Aug 2026 21:52:47 -0700 Message-ID: <20260810045250.3903576-8-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a66f883-575f-4d95-3368-08def69b4622 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|13003099007|12006099003|38350700014|6133799003|56012099006|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: Iqsc+94xqThwoxV6iLsKrhHsVuEjrsZDzUdDgNvEi1czWvvW8c4+lWf1F1zY98midvHKWV8Rgadt5IMKCRC6MECt4pTR9lfpksBTuKwl4r/sJZkkVc9YIY+tTXzMo+xXNPzNsbVJGXZquGlAQkliR2Ecl0DRi57Bbr1kgUkcxv7Mzy/GS8WlQ0Ncx71eCreyq0ktF9TT2YuQK/SxDbdeKKWn2GqY7qgbCgQHWuSyH62PVwlCs7jmV1/2D9roAXzi2gFoDec0er9ikAISB7U9wgz82K4iOCw3rcIUBXAWFkYGS03pXBYGp7Pp+uwO30H9t4GjVApEKhB/1QgqOIdyH56V/bBx5XYqh+1ly1MsC+zjfc+0kXoeescmkbyGPOACSOUJbUWAbMieaxWRtwOUdj2MquSrrghWczTXo7Mb0Vk7Di5nOX73G7syn1bLVXZE67h83GHw8lkGwndxzySgiL0PKGqyF3UyZBbTPvXQK/1A+F08ky6PANagrubcQunWZnaDoM2265I3nPSvVqknIyv7tb2/lyDtU0V8dy9SWHlhLTMzH1DO5vip20iNiIDvTKtdTlC+HlsyvPd1l4qRzR3VxG7dufoHtwPpUN3nggtgZnrkBUnFaVj72NhqactlugTZT4C1jrGVnGZls/3v/ms61L3CkCNBLQhZoJpdu5U= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(13003099007)(12006099003)(38350700014)(6133799003)(56012099006)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fMUcLafJO8Q4teDWiQlQUPlHuqVKw7Qy1LIUUSFBOXJdfpeX+EYyPiXgte5HoaytID8GSoXDRshm38vsfiRmIb0BIbAyVTpNpiHrbL2+uVdJ4SlT7pmHWRER+WIQsyQ3PxPS6H0VqvvJNoCL2X1rCV1W5Nzeyq8HhQTOODsoIPrNCZ5qqJHEVt8d9YfsQywq+MjC59ZmUctpvoab3M1IyDOdyVnOBrjeb38bsTyILcPWW9gGepgSTp4qCmi7MmjQX91UbUO8AgaHAg/5dE/yBT3FJc/7TIBZHc374xN5HwdR7oWbxyRF67P56SMhSWuuQdsRfRrsb2CMSp+16LaXebOsFmpNNiYAvzs2SfvWitHAymNWMSXuuTeKsPSGcfTKMkvKVG4A1vKn+quD0TRqwfVbT59luCbA34tkJZAiGHfysPaxjVgHXPbwPzDpDmqTrViwuRhwZox6FpACh1WTPYeG+cIwUbuh4du5zq+sUbaYGYYRp3gf7mRtgYXiYYlP03bJF2voJU3wClzhhytm4RD0hXU0gN7MR2HgKpbpipf4gk8pYdBXYWM4a46AuvepPrK/72I+EkCQFmcXIM4ID3J/HuIOZM27q9IoLRHJ/toPLXdpSgz7qxhKk3PXG85EdKrLgTEQ88RidP4YcdL4/LP6n98Y4zCbVYMsOCy3gL4CAOFwES5vTfiPiwh53sE0Dp0omMkIwcN7xuxQ+YTNJ/R08fMox6WQKo/jp13xTP3YAQE8qRI770idNs/y27ufmYKUJEFiRaUJnFpfRoKyPPIf7SvnI0j4QJTgtKxiPdfKvUXTXw3c1ABrz6HIf+2PxYcEyIxJBBySfq8T1nO6AoPjrUfLWAX4JhMWo69Sjzed7ac1XYT/ptACzGusIztnfdCqtWu0Gh+bznZfhVM4yIqXxRz5kk+fe4NiG/KcUUxEjtckOmdljw9L0WOBRbLlCt49NS2OilMjVXIVzucM0hyldFnFRxEKYY0VLZLP7lwu9VFKnyKBJHr+Memr775z1pYh7h3I2uab0H/tY8PynRVKP1duHgPaOOjrLCqM531xW9vzVd41UwihYZtv6UkG5P18ETraT5B7/c0vnT09lQB/L+7cwMAG8sL6l6DpStnfCrEZrYlzpakFTeDjhk0CQCpOj2L3l+8FERzihyrGE/JtDr/ccjmjO0lANR07VZ9lvYTnJ+Ff53Kkultvt0ophYCdyAt06WS4lD4eJZ8KmYOruOBggN7whUfo1FI+GTPlYwsywrVNzLnM0B1RCgPKxCAqax6quMXBuCFsf9Ow9g9msRZ3Zy7J44UO5H+Z6B6XRhTzgoxwUPKMZF8pwDhJvDOmVYKeJVWXgntf/ryiz9opHsii4+/GN8kRQzOH4eO7H3lX0d2+//MLQo+iXHuo9lKxNhIL4e6uYe0N0skKTFEDfi2mad/7zyWAKqQu6AJUOONlBzbeTYPH6PNWfnkyr9HPJwbDWeqxbtYvXfpnxC4Zxj2E1eIxco2fyDjQIJQUkzxV3dmFrSWoA9zcqPSkM6gErhjM8wS+ADvYNmTwDznEnhTZNR1MrWmSOISzLxR+f7MxV/cOwI3ndRoLI9yQ/e4zrVVTcqNy+j06aqHtwYQ9WJJzVxmvilq6zupva71eNUlDL07HlqTT8UZDl9iP0+2xgcLjH8OjgkIqf2nFCK8u00neI7RGuLsXmY3Owjip+NQZiiX80osob+MMo/ihY0tk3qqa2X28KxAnhpBdfIoQ1p5eTI4KgK4AF7FPJMs= X-Exchange-RoutingPolicyChecked: T8yq412TUkgdVpu68MHx9awxNIY2B/tUGJBd7SIcOQ1a5WMUdzJ1tR5YKcPcLByNimaIld9XZNI/VwJhmcWuKEwZ7QcdfKnu10qASnzvt7MwDAwIfJ077sXqY21Od8lHnaz8OyGNi/4Jcn+PC/rXFStrtWIqgYQA5JS4wcPBCzPv2Liwf1mWYFCJkgEesANKrldFQd591A/w6KfRjRioC2Nqj+OStDsT6aX9Hr5cR47AiWHQcdu7ykYVhpeCtc6PZ/narEng3a7GOMmYdn7+xEsLBXh54Qh4JRTpkcuvyltHxHMPLkk7LaDRx1gxRptS1DlCBtGZHDsCnIHyq0wA7w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a66f883-575f-4d95-3368-08def69b4622 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:09.1925 (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: xOYATUfr4D7u+VWKeemH43Q68zQ2D8lxJDYW7QWfx0noxCh2xeCKb/at5oZz2a3av/ZJggmE/zNUeqUe/upSAaVxvRr79dEW4Rq5xsbvMJ0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX8IH3NDmb3ayE bDCibSQmRkAXAS7Eg7PHtc2jW9tYchd2KGHi+WePx1cQyyzY7yY2fk8DTDTM0RI2W5Zn0a765Ci NFnYwUcBYs6t9/8TPJGCfON2spalz9efHLmF1oZBwKu3x4jvB8o9pO/RnKASclqdh9o5Msfwfcp /uuIpIyua/VqQ2bA2RWdh/35hV/z9O5av5579tLSuwDMiYEdJhUUCpHFz7m+wXC83ioX0byozAj VL6WqE1eKwRVs4gQGiBuPeZfTGIBS6MqyZLhGaewNnyu3wwDv4Yi/FN9Ku6SCKvoZ89faQhZwBJ zq4EI368hzI3GJp0DfsEOm8RsS8ry6i15dq6reNH5dvjQ66U+c106cxUzgeqfK9jOD8YGycbz5w a+3xZzxarYQxK4+1jWGcaW+oeDOxE31+iR1yaBA28GQpR3bmwxqO/KuMMJxqH4yk3nbBi35/tqD LqA30Kx9j/z/29GzzQw== X-Authority-Analysis: v=2.4 cv=NbHWEWD4 c=1 sm=1 tr=0 ts=6a795937 cx=c_pps a=T1Jff0mhgTaaoho+8HaPfw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=iKiJcTA2PjBS6x5JeXcw:22 a=NEAV23lmAAAA:8 a=3uWsZ661AAAA:8 a=t7CeM3EgAAAA:8 a=tyuvAb6jAAAA:8 a=UuYfaZXYcpLLUbsT0ZkA:9 a=fYNom5PXsM5enKJDCoVv:22 a=FdTzh2GWekK77mhwV6Dw:22 a=vMd6T1JfvD_20K6YSfI9:22 X-Proofpoint-GUID: fO5IX_Ns8w-tpsoDBRGxNLP9Je4O93e2 X-Proofpoint-ORIG-GUID: 712DIkLOxvKK-RlMl6DllrpIaiVfjJZf X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfXyoARYwZ8lx9J Wyw1+uluo0MQ4c4/9nCtWoolsAWoWJEde6jbmKpyCNkcwZeLe7xDlsdWQi0pGq29nmsNoECAr4x NpjTr2oQSZChjiMWlC1iaWM56wRQ2Zb6rWQy4a7t1rjHqSFlNuam 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 impostorscore=0 phishscore=0 adultscore=0 clxscore=1015 suspectscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243098 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 Signed-off-by: Sumanth Gavini --- ...-Verify-that-bidder-and-filter-match.patch | 101 +++++++ ...nd_filter-Use-last-bidder-for-filter.patch | 185 +++++++++++++ .../libarchive/0003-Remove-bidder-name.patch | 258 ++++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 3 + 4 files changed, 547 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/0002-append_filter-Use-last-bidder-for-filter.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..2413f70785 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch @@ -0,0 +1,101 @@ +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); ++} diff --git a/meta/recipes-extended/libarchive/libarchive/0002-append_filter-Use-last-bidder-for-filter.patch b/meta/recipes-extended/libarchive/libarchive/0002-append_filter-Use-last-bidder-for-filter.patch new file mode 100644 index 0000000000..f412b548d7 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0002-append_filter-Use-last-bidder-for-filter.patch @@ -0,0 +1,185 @@ +From 6a3b6d4d2924e623c32c398b74d61bd49b88fc36 Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Sun, 2 Aug 2026 14:27:17 +0200 +Subject: [PATCH 2/3] append_filter: Use last bidder for filter + +Appending a filter implies appending a bidder. Always use the last added +bidder, since it was just added. This avoids desync situations where +previously added bidders could erroneously match. + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/3346] +Signed-off-by: Tobias Stoeckmann +Signed-off-by: Sumanth Gavini +--- + libarchive/archive_read_append_filter.c | 72 ++++++++----------------- + 1 file changed, 22 insertions(+), 50 deletions(-) + +diff --git a/libarchive/archive_read_append_filter.c b/libarchive/archive_read_append_filter.c +index 8de1b2ea..9dd9f536 100644 +--- a/libarchive/archive_read_append_filter.c ++++ b/libarchive/archive_read_append_filter.c +@@ -33,14 +33,25 @@ + #include "archive_private.h" + #include "archive_read_private.h" + ++static struct archive_read_filter_bidder * ++get_last_bidder(struct archive_read *a) ++{ ++ size_t i; ++ ++ for (i = 0; i < sizeof(a->bidders) / sizeof(a->bidders[0]); i++) ++ { ++ if (a->bidders[i].vtable == NULL) ++ break; ++ } ++ ++ return a->bidders + (i - 1); ++} ++ + int + archive_read_append_filter(struct archive *_a, int code) + { +- int r1, r2, number_bidders, i; +- const char *str; +- struct archive_read_filter_bidder *b; +- struct archive_read_filter *f; + struct archive_read *a = (struct archive_read *)_a; ++ int r1, r2; + + r2 = (ARCHIVE_OK); + switch (code) +@@ -53,15 +64,12 @@ archive_read_append_filter(struct archive *_a, int code) + r1 = (ARCHIVE_OK); + break; + case ARCHIVE_FILTER_GZIP: +- str = "gzip"; + r1 = archive_read_support_filter_gzip(_a); + break; + case ARCHIVE_FILTER_BZIP2: +- str = "bzip2"; + r1 = archive_read_support_filter_bzip2(_a); + break; + case ARCHIVE_FILTER_COMPRESS: +- str = "compress (.Z)"; + r1 = archive_read_support_filter_compress(_a); + break; + case ARCHIVE_FILTER_PROGRAM: +@@ -69,43 +77,33 @@ archive_read_append_filter(struct archive *_a, int code) + "Cannot append program filter using archive_read_append_filter"); + return (ARCHIVE_FATAL); + case ARCHIVE_FILTER_LZMA: +- str = "lzma"; + r1 = archive_read_support_filter_lzma(_a); + break; + case ARCHIVE_FILTER_XZ: +- str = "xz"; + r1 = archive_read_support_filter_xz(_a); + break; + case ARCHIVE_FILTER_UU: +- str = "uu"; + r1 = archive_read_support_filter_uu(_a); + break; + case ARCHIVE_FILTER_RPM: +- str = "rpm"; + r1 = archive_read_support_filter_rpm(_a); + break; + case ARCHIVE_FILTER_LZ4: +- str = "lz4"; + r1 = archive_read_support_filter_lz4(_a); + break; + case ARCHIVE_FILTER_ZSTD: +- str = "zstd"; + r1 = archive_read_support_filter_zstd(_a); + break; + case ARCHIVE_FILTER_LZIP: +- str = "lzip"; + r1 = archive_read_support_filter_lzip(_a); + break; + case ARCHIVE_FILTER_LZOP: +- str = "lzop"; + r1 = archive_read_support_filter_lzop(_a); + break; + case ARCHIVE_FILTER_LRZIP: +- str = "lrzip"; + r1 = archive_read_support_filter_lrzip(_a); + break; + case ARCHIVE_FILTER_GRZIP: +- str = "grzip"; + r1 = archive_read_support_filter_grzip(_a); + break; + default: +@@ -114,22 +112,10 @@ archive_read_append_filter(struct archive *_a, int code) + return (ARCHIVE_FATAL); + } + +- if (code != ARCHIVE_FILTER_NONE) ++ if (r1 > ARCHIVE_FATAL && code != ARCHIVE_FILTER_NONE) + { +- number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]); +- +- b = a->bidders; +- for (i = 1; i < number_bidders; i++, b++) +- { +- if (!b->name || !strcmp(b->name, str)) +- break; +- } +- if (!b->name || strcmp(b->name, str)) +- { +- archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER, +- "Internal error: Unable to append filter"); +- return (ARCHIVE_FATAL); +- } ++ struct archive_read_filter_bidder *b; ++ struct archive_read_filter *f; + + f = calloc(1, sizeof(*f)); + if (f == NULL) +@@ -137,6 +123,7 @@ archive_read_append_filter(struct archive *_a, int code) + archive_set_error(&a->archive, ENOMEM, "Out of memory"); + return (ARCHIVE_FATAL); + } ++ b = get_last_bidder(a); + f->bidder = b; + f->archive = a; + f->upstream = a->filter; +@@ -162,37 +149,22 @@ int + archive_read_append_filter_program_signature(struct archive *_a, + const char *cmd, const void *signature, size_t signature_len) + { +- int r, number_bidders, i; ++ struct archive_read *a = (struct archive_read *)_a; + struct archive_read_filter_bidder *b; + struct archive_read_filter *f; +- struct archive_read *a = (struct archive_read *)_a; ++ int r; + + if (archive_read_support_filter_program_signature(_a, cmd, signature, + signature_len) != (ARCHIVE_OK)) + return (ARCHIVE_FATAL); + +- number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]); +- +- b = a->bidders; +- for (i = 0; i < number_bidders; i++, b++) +- { +- /* Program bidder name set to filter name after initialization */ +- if (b->data && !b->name) +- break; +- } +- if (!b->data) +- { +- archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER, +- "Internal error: Unable to append program filter"); +- return (ARCHIVE_FATAL); +- } +- + f = calloc(1, sizeof(*f)); + if (f == NULL) + { + archive_set_error(&a->archive, ENOMEM, "Out of memory"); + return (ARCHIVE_FATAL); + } ++ b = get_last_bidder(a); + f->bidder = b; + f->archive = a; + f->upstream = a->filter; 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 63c66eea81..9d7bfef231 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.8.9.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.8.9.bb @@ -32,6 +32,9 @@ EXTRA_OECONF += "--enable-largefile --without-iconv" SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://run-ptest \ file://0001-test-skip-ppmd8-aes256-streaming-test-when-no-crypto.patch \ + file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ + file://0002-append_filter-Use-last-bidder-for-filter.patch \ + file://0003-Remove-bidder-name.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/" From patchwork Mon Aug 10 04:52:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94840 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 5D735C5AE5D for ; Mon, 10 Aug 2026 04:53:22 +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.23021.1786337594178015068 for ; Sun, 09 Aug 2026 21:53:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=WcH/x68r; 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=26826cd257=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 67A47doX1046466 for ; Sun, 9 Aug 2026 21:53: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=8kr0g5DQ9X34LBibsh1mZHpiLeMj5sqZfbLU0sFNyRQ=; b= WcH/x68rc6mdf20dMEfQRvI943ZpZz1n+CU5a5C32CbAz4l/IqapdOg6Ka1TwCtq R63sAsyo/fFP3ia9rfApfngxLhPBaufzNYDe9sGRrUV6Fet6psxPu2LDJPq/csu0 k9lGy9qUpAq6b+6E6FtYkeJjSXxsbsyW7uotRdXhT0vrZgm1C26HYkzLDOsAlc5q GFQE+2HO1yhiN4/3fBU+vcSbahoaVtPc4OyFLhItCRJmEPMdgOHw7tzbgbBVxmoF EFCgrIVZ7kz7A+nxsKrVIZ/t2SqFH0h/9f4M9zisZ8luM6uhSuA84ECBEE83pBNH bxkXqGBHhsUBv7awW32W2w== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11010056.outbound.protection.outlook.com [52.101.56.56]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fx3yehf5b-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 09 Aug 2026 21:53:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oSnDIUPK59dMZ1oadf46j0otG3273SF5LlPjl68op2JCVESjEB6Cun9s10/4zUBhLq9F00ltns8eNrn795I8EthBZEiZ0d+3ECZis00o8YD9u2VQVn5Rc8Wc4HmwzW3QgIyrSraujIAxI6lbXS187GOrhtZFgyDg283u9PWYgheOTfpl+wMEDitPBFGZMWUacO6bZ2xFogn11mu2ts+jISgGiEEdarrWvLhI+427XjorNNibNEWjimkvMh+NPECGoW1WXEIl3AS/QFLuo2/2bdwHGYsUBfbGT15U9D9yB3hNeCLa3eFBfMo17EHRgdbQjbVDfsBoSdZm7TXP0Asksw== 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=8kr0g5DQ9X34LBibsh1mZHpiLeMj5sqZfbLU0sFNyRQ=; b=sjoNDsj9dbEacyN3rDEspRVv7imBu1SmwzHhEMdSuvJxmIhPDWOHXu5X7XUbmLWHyEHs6wYZB5asXz+OHOp1p+IdyzBHodjaj4Lx5RJLBrNFFeipUb1RbsJrNO8GhdjJDfdyuBPdUAm41zu3npBQxrNJoSs3NrAt8f3bjvRqh9iSMAUdvO5OtbD25f0Juo1T/jlDRVImYxyt0qv77+1JFNjGQLSXFJ7+y2VY86aHmIoRzA2xHlVq3MlFijuM7V01mKe+EZjEDJVOOtlZEXlay8hvkxm8+NbSo+q6mG/C8rWLOL6yuNm7Du4wLfD217q3SdI9SfGvH/I4nEYIVfgBVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:10 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 08/10] rpm: filter /usr/bin/pkg-config from RPM auto-generated Requires Date: Sun, 9 Aug 2026 21:52:48 -0700 Message-ID: <20260810045250.3903576-9-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ad44a4e-0c57-4b35-eb30-08def69b46b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|38350700014|6133799003|3023799007|56012099006|5023799004|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: 7/6UVdnRyZ6m5hdZM5QKnHQKqokzB7haJDoGjvOJ+AkrEP719XV8YCy2xwojuNTn5Jox4+9xN21ygNaW9CB39A51yp4UqHnjp8jmMUsGzqG0Cxegxt3RX36TAN0876cQRLs945OOGyfNagFnQFsZhbXxJpmYXaKMnbi7KuOl/bOMTtIQhY2Y/vLNqb4SfFLeEpLcFkvk4uKKQuuWOaSiJyQQIHck8hux2JRQLvx49XYNYb8GQruCmBPuYvk10cYVHSTvOwEtiZd2IJ99C8LEr7SjlNHmMiSBVWYC9T1LUozNrVcd+CLSOceeOxcofqPvt6RGkyeotMZG4iwJQ83EoBgHJHjIspWezhaquToOSGpTcDMlIR7XKKe+5ZxDAvNvZrQfU16+LGJptq26XQBUX8MrIjG1BQuBLZYrvi4GakrWC2zrdscKMt/f/hPJ4RvbJhADMi2PpByO2ahuUDKOjiqmV98ab+WbxHajWP+EElWNb+LjFr2zKd+MCYzx0GvEY5KBxNttWpozwpR7Ex1jPUpgV9g30Yy/xCNThml7wbzaMZ9gvf/9wqKGQr9JsE7e7H1mGjORtlXZ0FDITfwaEvTpdg7GkPHGKC4132DL3JrKQMe0V+gXoZZ4l4NjJ5l9tI7FDC1cUu5W4AnR6seCmtc+ruF/806Wtnj0oEi1kM4m8DbOQA60uow4afk7MHjzXzjCqAqc+voJ+RbXZen/LFvIXpLCCRpqxSPy9fseUR4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(38350700014)(6133799003)(3023799007)(56012099006)(5023799004)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yi5Fo4dXGonBgPQ/rLMy4qR0r438quJrzuZ4zs0Zs0HEM3vuceVRiP57ukjb2iqLAY8e7tqY83nkihFHjkcH6BViaKgwzzgFkdj+6gGrE9yPG3eSXgA1fYtLiYKSRbWrH03DKmJE9l00VESyNmurd3GM8/1PJCc2FZMKSa+GkaYdHSg+EXWv/seVuaatCWMUBpyF18J4OpkCrznDOO/ZODc7FHqC3KlU6KB4NYmwlXBvvZa07RXa2Hxws/2smKf6GVUnNh/t73uDV8DB3VXblAI95LC93jnjjZ+LqXDmVtk0s2uK6RtDq214GmhSEpMY9dyIjmr5UXD6jnOIwOXInYUNMJBqtHGYrvZCus9yZZxdqFefTjvx+4POJ5ic86tkH44yJbbLV8RBYMEoXYXnCkcWBqGS824qCxrEL2gFekXBQibcSXwO509WdKDygYPzERzhFCwusJHL4Lm0u5X/Ks1ofAPLYd3hQAaDv6xqb3acCbXYRzjsSVE4yQTyM/GwZY0Yo/SKn0SPYvSrPB2gGQOeWyfPdQsMRKUxb5NW//MMYVuVCgRU6Assv1GyDi8jND6CDkxq5ybxvIpkx68+thOits8R/0afPOiIlSjYZfpuA50+k16XHvN44S0UizGjVuZOnzCmmSQhqhV5qrffbLRVH+hBbwDSiOFIwBXfYhSWpuqgzo/cJSWap8ruyjfsiBwtFxr1vkEyQ5wBlYPZCsJViMPyu6x/4+FAoFUTnkqlzW7zvRrrJk3a8z7jjxKAycE2WmQUJpSTyJIezenKbKOT2fCfcajgUAye6dZ5iZmmD+zgSFiRw3omjnnG2tSxcwThFiXK++dKbyi3K3A0RnbBmkKtP1KpYE4iW2NpIqUeGz25JgW1YzVYdLeBEMInac1c4tYEopo9+7am+6hDjizCdao9GR8WnYl++FMptRAlHg+HIXkufz3ZWuwLcjY0EHXAg5tP9XU7SElTx+9NkFd/qWb8v+r3u5yrWvJUMptx1a1tfsVCpm05zx5XYEprBuAlN2241kyTHA59wz8uOIYN2lc1MZb48I9lUks3tWya1m5e2hoNTy1snlwIGa6YjFTsX1t00pkRm7g1LdSA1/68Dv793xWWT9MCJAy0Fmc7SPrO+66Dogo44xDkccPskL8PzN+WjFwyh9IYFKFGsALdKH1nlDozJQsnf4MZ6rabkZaQmxkv1V1KVT6qmW3G+L5AWkT1bhOKHu/VczSdd82U2RROhpIs3aaAzf22berK3yBCm4JE1cyQnSmULc5izkPY5ajyYczbT8oMI2Rbm3j9f5qvg24dYdCz5Cc64aVthput7Aur6Hi7VAf8YEzMi5pN9ZD0lptVgucD07ncIvkrG+Z5SVrqf5RjDaGiCVYkpqt0NObEE31FiKslz+RLxVdfaZF6bHWJJQr6VYJX+11r/wEO1dLarnwhw7xdQfb7v8oHTrocZ5FYwF6vviZ9xTRkQM+JAv7g319ny/dtB9PITfDV06OTcSPig4UpbBNk5I08+rCsXQO0NR0W1Zck2Q4JK8L9NsAqZ6dpCNflgI/PR5cHmLBKQwOhq38j6M//9e47aCLdfZIC3nDFcT28Rlg1kyTM3L6P814k88o6pR5XJvG83KyYP2V9tEA/NvuZZ+WeO9t6jEB0J5DbBpS8XwDkx+qw6BP6Cg8fweK6xOgqzu8s7L70vm54yXjNfa1N6sjjfjaZY58+tvCMhwP3FzN3mWDbXC2XBHeI4jguczIT8+tceXO/gy1fdOt3q10= X-Exchange-RoutingPolicyChecked: Bu1HigcokqOnsaOMgzsgIz6joV22Pn23sSaEZCMaF4zjz39IdN8Nr2RwPg6SBZ6ZkNReKEeztCVYUAu+TckVeDRNoDjl1eSH32oyWR0HMRet27vl/6MbPzp+h7CVerRmsmKcqsL827OepIMIsIgZX+gO407Da0AA7dBzQ+n365Ec7sis4VA1vQc3lKNK/wkppteaS8Iez0cml7hy2dHgF6FZx76kBV+ASTR5KQXEfRhkaTPSlMZPwLBlaAzc3+JFRwfhbZVGNzpmFDEhk/WjZIwiWkPAYpawo8lBezPF7kE9m3dUjmL7u5377x7sErce1NdFxywFP/v4h5nJbGEz0w== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ad44a4e-0c57-4b35-eb30-08def69b46b3 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:10.1364 (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: rMuwkSSJZxVp7ohFZKRgSG7+0iHylAirjRvmcGIG83kqYhhVOm6OmPY4NJ7U6uGOIAHhWBYRHBNaNxMpZXsApdUgGIMWg9+g/NKdZEEvzlE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfXxe6kyORUJqju rzUU1a9U1U/f/5bXU9dtKMMqh6QdbatUr9R4k1tgLDVx2yUxhoA83wuOCnp6V7kZx9qnC2CZq2R NookdCgx/rXBudvBsxZpHgRPP/tv71X+r8kqzHg92FcfM5xd6vJ+I4SmT06sro13mmbJfo8S4Cz uhFUg1+CCvfKCD63fyeH7l6YMbmTJM2JL1lTsEF2YiP3ITGd53XVt+B6Ivn9a9WjP/fpMTcRBc0 JYsP+FwqxJpVIEMTo3mORNeZtRHySafGKIJy1TwfaP0Qmn2pk7n7NvCqgyUAT+FDPvJO/1MqKcv ALCAGBwqAzGTRQJyOVL7z+iMiZN6hoAQCMXeo+WeeJqo10n1unaF3sMqk9N0JIih67mKEoRG58l DzNiwuDtMR1T0knlGn07YMF/gtEojcPLImrYwz6LYOnazlFUVrLSlx2cJJfk/uqj00j/J8Xm7hk ublQkgt9pXfc9Axc89Q== X-Authority-Analysis: v=2.4 cv=NbHWEWD4 c=1 sm=1 tr=0 ts=6a795939 cx=c_pps a=T1Jff0mhgTaaoho+8HaPfw==: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=NEAV23lmAAAA:8 a=HWfS6c1Ke9pW_yr55HYA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: dqRItAd2AYn20s3TuUyILRYJ3IzYG5wP X-Proofpoint-ORIG-GUID: erTGwMjpB5xLhuPizHG0ClIXDGh8uXiX X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX6QWoXyafOUqG N1rMK62M02NL78HObciHTkoLFBllBAE+e6z79O9PIowd+z/elU/EqX51z+IH6unfdlEDWZuhBc7 26VkTSFormV0tABtaF9k/j88Mwe85sudllyuvOa92sTTPguq7UMo 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 impostorscore=0 phishscore=0 adultscore=0 clxscore=1015 suspectscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243100 * Added 0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch - pkgconfigdeps.sh unconditionally emits /usr/bin/pkg-config as a hard Requires for packages shipping .pc files. In OE/Yocto cross-compilation, pkg-config is a host-only build tool not needed on the target rootfs, causing do_rootfs and do_populate_sdk failures with -dev packages. Signed-off-by: Sumanth Gavini --- ...-Do-not-emit-usr-bin-pkg-config-as-a.patch | 59 +++++++++++++++++++ meta/recipes-devtools/rpm/rpm_6.0.2.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta/recipes-devtools/rpm/files/0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch diff --git a/meta/recipes-devtools/rpm/files/0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch b/meta/recipes-devtools/rpm/files/0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch new file mode 100644 index 0000000000..4b9f1e1dac --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch @@ -0,0 +1,59 @@ +From f7d33d39e48d8b8c99af1e97bcb4740a9ba6204a Mon Sep 17 00:00:00 2001 +From: Sumanth Gavini +Date: Wed, 29 Jul 2026 09:10:47 -0700 +Subject: [PATCH] pkgconfigdeps.sh: Do not emit /usr/bin/pkg-config as a + Requires dependency + +RPM upstream commit 67b68cbeb978 ("pkgconfig dependency script fixes") +changed the --requires output to unconditionally emit +/usr/bin/pkg-config +as a hard Requires for every package that ships .pc files. + +This is appropriate for native RPM-based distributions (e.g., Fedora, +RHEL) where pkg-config is a target package installed alongside -devel +packages on the same development machine. In those environments, +requiring +pkg-config at runtime makes sense. + +However, in cross-compilation environments such as OpenEmbedded/Yocto, +pkg-config is a host-side build tool used only at compile time to locate +libraries and their compiler/linker flags via .pc files. The target +rootfs +is a cross-compiled embedded image where pkg-config is not installed and +not needed - the software is already compiled, and the .pc files in -dev +packages are intended for SDK/sysroot use on the build host, not for +running pkg-config on the target device. + +With rpm 6 using its internal dependency generator (rpm 4.x allowed +disabling it via _use_internal_dependency_generator=0, but rpm 6 makes +that a hard failure for v6 format packages), this file-path dependency +ends up in every -dev package's RPM metadata, causing do_rootfs and +do_populate_sdk failures: + + Error: nothing provides /usr/bin/pkg-config needed by + acl-dev-2.4.0-r0.x86_64_v3 from oe-repo + +Remove the emission of the /usr/bin/pkg-config file path from the +--requires output. The pkgconfig(foo) virtual provides/requires +(e.g., pkgconfig(glib-2.0)) are not affected and continue to work +correctly for build-time dependency resolution between recipes. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Sumanth Gavini +--- + scripts/pkgconfigdeps.sh | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/scripts/pkgconfigdeps.sh b/scripts/pkgconfigdeps.sh +index ef4581856..1cab58169 100755 +--- a/scripts/pkgconfigdeps.sh ++++ b/scripts/pkgconfigdeps.sh +@@ -43,8 +43,6 @@ case $1 in + while read filename ; do + case "${filename}" in + *.pc) +- i="`expr $i + 1`" +- [ $i -eq 1 ] && echo "$pkgconfig" + DIR="`dirname ${filename}`" + export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" + $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do diff --git a/meta/recipes-devtools/rpm/rpm_6.0.2.bb b/meta/recipes-devtools/rpm/rpm_6.0.2.bb index e8977aa31a..32ddebe407 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://0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch \ " PE = "1" From patchwork Mon Aug 10 04:52:49 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94841 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 4FCDBC5AD55 for ; Mon, 10 Aug 2026 04:53:22 +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.23022.1786337595536121234 for ; Sun, 09 Aug 2026 21:53:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=QvsONg/p; 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=26826cd257=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 67A4iwHM1002694 for ; Sun, 9 Aug 2026 21:53:15 -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=R2W4t9rW4aWdHP16R7XZs9kXGRfzBiamh897UfVOfaQ=; b= QvsONg/pHyGlK22Dt4AcDkyuXSwsKxrXyXiPO2vgdD/EzC6FfMf+G9PygsWSn/3y WCy/PdRQ3sXTkgQeBda1j3mW31TjXOiASRoh/R8WCzmUWU6ZvxJK+NULaoPZu8NF ILzLOfn2D2rQ80C7jiuOy7PrbzLml/kOsPIKENyXC0XCWbjlvq1AOASmmlx1X7ll GEqxRJOgkbjA4iZfIcDjsrT3PlpxuUtQdkDmlB8/IXJ6Nf58ewsp01YkJYuhOcpr on+D1uOZLVuObJcpnKsVFSzTmUYUavbYzhogD7zF+FuHsTPK71au7FqV8PiLhMzq 3zgghwmnGUKIygMPo6WiIg== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11010012.outbound.protection.outlook.com [52.101.56.12]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwyr1smpc-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 09 Aug 2026 21:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LFAdqcQczohOhcgQoOITcMZtpOyVmteAkrO2yKVMGzivydoShqWf6KyngiZUe7JHnMiJXNiiv5d5pLJ+tcvWjRui9SR5SBlW9Xm8+9/5gDU+55s3IsruPHeDI/mPpRe/4LXZQuK45S5OuNCiMUGl4i+wEupdTbt5lx4i9Fp9AoSOQHIDCUuSCcLiDmAxr2aJs6eHeRNqDVE5QCmB3IosvgNHHX5YaQQ2dyaxRaSj7wUBd4BCAclTgd+iP/pes88ezXK06bwkKEJboQ5RQ/+/IPHh8jDZXnUOdpOa2A3ikeBUnmQG8p9k1B8MKBVQwslZyE+R/PHQjheph/lyUMIg/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=R2W4t9rW4aWdHP16R7XZs9kXGRfzBiamh897UfVOfaQ=; b=V8cmmo1HPMUItSEqhATZWTLhQJClWungyOQkfRe//Zj3RAmTgfpYOP4trgjogMwUWb2I3A9bcn6cnCDbkAUlrfSzPe9D4llXU9J+L6qz56CEntNk+UeIc4LoXg/2jIvZCEbU4uJPWrYFygvqgU8EkkBwlhxHGZ9cDUzUVp7WF2hNR/4VIixLFO6px+oQplChCf/qgk2RratLm30N+qPFb21MOREqjEGOER2W352XcE7j4P83zHEZ1gC9ZOzhEhSxfwwmxgnZ0/0oycWDdKZ7saWXCTzpDn8+xzqy+7+zGmQ3WNKSZ/mfRLxM1sRG/WHf1kasq0BkZJ2plshXKB9WwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:11 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53: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 v13 09/10] rpm: Fix pkgconfig() Provides missing in cross-built RPMs Date: Sun, 9 Aug 2026 21:52:49 -0700 Message-ID: <20260810045250.3903576-10-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: f31867e9-99e5-4471-bc6d-08def69b4743 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|38350700014|6133799003|3023799007|56012099006|5023799004|11063799006|10067099003; X-Microsoft-Antispam-Message-Info: svXejcKBWqECUmZC0K/ie/TUZLfLeSgrA8gpbxWYP4XdEBYt0gO6IFvi7f8mEPXDx6vh3gsC0hBnXJCVK/9CchWRHH2A32hYTu+ZjOJ6+pUl46N/Th954caVtpIHIFI29kqSQKHTwDr//c1WaNmuhpyNLmRv66bmNEPbPH28O+xc//Q5FU73zqMLC5+/HZrTzNIVKP1Dgip48jFKY0eaZXj1ggQbbni2+CNIczEa/JLFhl/GwUtUQFV/10BcATcHBOa6Q4oE8jv1DiDYM24oGDfsaK3olCibY2y+LWQ0yTUQNKeGjXt0y75Kfroi2jetukcCCRvOYIKsD5E6KWFG8m4d4MPRweTZh0cX5+xW0WD4LMsfdDdDedzx+bMQzm/GrQv3lSZSfqSZZAiiwighuceAnc1JTYzKG+CMU91WNs9SqUT+Dn0/bUw0eVUhGc5oejmn7+8Ru6Ij0+8kB66aGScUR6js/QLq+lscMPYmLMsXlr6sLVeuVMJ1D55UAL8jSjwxHf6nPel1KiitP0S96gb73ag7e8jTBinGjOL6vo/rmR14hVs1oIFxg3x1iTSvOWxOvw+eq44JuuujYcGUaMatYRjH5eBrjZ0HqipNzC7icvviPjU27IzgQztuYp2OSLtcYuM+NXBrK8sgGdEdwyprdm/wWWw0Mz3D7R/OjP65EUs0VZzC0+WYnNW+WL8/7fQjxvpVDSFW7VWlVqcdJOHjwSYfppq+kYQRxE49/fk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(38350700014)(6133799003)(3023799007)(56012099006)(5023799004)(11063799006)(10067099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7qSokcor9ael1JeTaGDrnpzzJ525jASDlgCyh8gUWGDzUhw9tB5kzGl0pBVmJM4sMOJmrN8mhD60JMDzrsFx04yJq+4vWAQXYih+8v9iD01d7PLE732BUQd8fkEJBgempcsTo84adGFGwo4uv0RLiQy0h4g1IH6051/DXjQcslDKjKLrhr/QGDM3CLNXf6ON8yvv5xN7m7lo/RlJSMyyk7Skmw7VE8ze29xGeKEQWHTJgNkfAS72mGBvRgE4zNga6NKupzUBvq/UvtWD40RZNH+VXhOJP/wpokA8h3wnthnZTf5D+o4EX71jcLx6xNOe7eSVyYXZwzFmhY/t2NPmN8BTRv1fZ54Bq4xQPeFkGIdpc8Fe1bTfEr1lDlCXT/8OlUKCqGNLRCM1kIDI8JPNyHLFhZwtfcqTsEDV4GVR/jjdNxFNX1CIU7YIX3PN0jR2gzVSwh8t3H4a5aqpnpHn/zREu05HnU7+thApkO+S814Uan/Jj+ENSwYbP4DoagS1KrA7C51uDB1E8PsPTOjiGGggac8fCY07aoxXlknznTyvFiGORLEP2Kgcrdr+kLGcbrG1fZ+4y3QqTIrFnmnGVYFCMPuUnzdBbgm351yxBrJuRbQXEkPNtGlNZWQ9TDBKevd5JWDopebMbl251NnjbftAlgjsmuPR9N/YVEMGAoYuKOAvcgvWWWcXPq7Xir/269uV17aurlyYH1uX90riee59EwjGxdjdwBreXqqwVlnE9sWB39SYlb13T+1XyF4knT/Q2XLoVgn7EQo3bBEMf2UATD4uzEr4v8hkQ6OiwOnde5Fj6XFE6DOzGIUqMKbaGS/LsAjtz6gYiXtULkA2Xt4cdWi8QUoa7WXMSjHYnUVEQoI//inloTUNEPz5RUaR0pqZ3hzmZj17TJ+FtWtlPa4HujyOq0+goU82GH94HPdtKpYknL0bggnNg3iNkUEKHgWSMIXsc4kImMMCyDvZ9V6riXKpO6IynD5HkosCT3K2akaXAF0HvUuzm2pOqr/Dirl8M2dGVLZTvh/Fxmg+18jp9Hdjf7pUDZPzESVUR4Tl8cIv0iLjNzpPtyvOSQA//oJMfX1lvYoiRtM0M8ZU0cAYFG2WawL2XNUaAD+7FWAqFGio2WOWSd4fbjdKoKBGyolGnV3S4MsvKYjQiM5HxTsFC/W8Bm/wyKaT0il2YITo/O+ataFxl7bF87mq3BS40Aro8XI74G6+jU5XXxSvJl8FE8ma55jYWbeQvChjygCW3nWvyVW+uZut5km7vN5feI4wa1IjXbAF/6/qpYwRUP++bUVklhBauwUhGy4Tud6XnyzaLqzC02wk9ZixLcxsbqb6dokK/d3/d3DfWviFOMaLXnv2rrKFCWWxczDpOazbX3SCvDmb/LLpPDpKo2RfRJbxLunnUoyiXrdyyP/JuYj8P9GdhY9eyyu2vYcAn9oeHO1eLd98Vrd3frrGZVb+KWxdGhgoD9SAe2R8NTBHh/L2Daodx9EmsAAiQ/SkAczcYZh/7ZpZVmxwq1yiIURXoIU+aRklItque3EdKHFhwJapHj2x6ih1zH7wSD4bb2mwE5O8U8A/TCWjVu694Z4z+wQnDevJDlYGllC5vAcvoa/zbNAi4NlAvHrCi4wceTl91ld0oGKTyd81MTPtzjZwz33u5pArfzQnNmbiynwUfnObGrVnsKVOoHODKf3uAmSjmhrQFrPCw2I84w4wfql+0qTh4Vjs47LZRzTa8/R5ShFLyqOcaRnXA/Gw6iP+3kY= X-Exchange-RoutingPolicyChecked: kZJ/CiFEzfQu7a5Q0qAoqYh3TkoG12+Oap4YMKrPSBtc7Toym+fIazKqQ1jGvKqGYgEnELjSly0720XHfshkA6eUKXDhPjR3kLBYh5XPS/GV0tEhhY1s49f0E8SQYfimHM6P15BkRncLIesBIwHxZMnhhBIfd8HcDWroR5rINj57ZJgjtzyluXcyLauao2ZKd7diFDjdyMzcFXKBShm7lmKHaYDQdgA5bgsLYhHO1l1rXdMblmV8rHb7P/DLiZiWdxn0KkWuWQGY05y6i+qMgqUMsdkWDnZ7tC7MBktZQZc62vflk6nhygShrGF5NRLw6KpzP76F0OeFgGeDZuL7iQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: f31867e9-99e5-4471-bc6d-08def69b4743 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:11.0713 (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: TCTkYnc2AbD4z1gNMLMinpTvDdGoyzrep/4uNrLhveX4p0QaG02i3HrPxAtEKbYMu5LwRm+ohZErxnKQiUtyxhYLaowKC3OC2SsXm+mIrKc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX3JyI+Ra5wZ4i SC4nvGMPwAR4iG1jwM8UyNhcjTqmXra9PAJf2dsOg6VPuGMPHBN5Zmn/f/6+3HIxSqliVekEVpn SbmOBmrWuBTKGBuyOK5NlM4N9SOE/ka49ruDHCHsq16wuOMUK7Ekpo0vJSI4sO3xUdm4zw7o/8E 7d0IMioWCdJZLSqcUZ+HhX3sAT4cg5+bgcEJZkrU1HXObMiSkdulgSDNzYMHyVSaDXiVReAy16I 9OoNVkblv81J3SsmoentbXKXpIOucGZoyLiaF9PxNWiLjalU5WyF0MBoRUpoFlxjrRQUZtWIcEo D7vW/d0DgeIHGoPwND57b6/1cs/uP7eyBYjZTddmDvqvAjUuLOZXbUS+8FUJW2YJzoUx5pWiYNh mmuJJ0QYGV2AkbJxam8As0r7IwE59mAuX1e/eUDMTay4HZZNtOJDjoB6MLT3M55M5YLDGa3bK28 sxJ6wdNPY/8tZq49gOQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX5hN+8OTy+H1/ jI5LZCXMdcz3VKQbPzqacw8pJ7Wn55eJz61ub7V26wAcsoPP0Tqf8C7+KN/256myZi8tgkiujpZ 39nP6azvPK7i+uQ7ZRFda65+uxQ20OSDxdb6opEeYS2idrL2yONd X-Authority-Analysis: v=2.4 cv=Z5Lc2nRA c=1 sm=1 tr=0 ts=6a79593b cx=c_pps a=CjRpyDoPu1ZhyeacGh9KdQ==: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=NEAV23lmAAAA:8 a=A6YZNiJOG_xbVXSWyD8A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: E4D1lgka0UykY04NfTIF0W8z7Efm74l0 X-Proofpoint-GUID: igF15cnPpM83IMjfG2Jm8pOPU38O9LiZ 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243101 * 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 32ddebe407..4644051fa3 100644 --- a/meta/recipes-devtools/rpm/rpm_6.0.2.bb +++ b/meta/recipes-devtools/rpm/rpm_6.0.2.bb @@ -40,6 +40,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-6.0.x;protoco file://0001-tools-elfdeps.cc-Remove-format-module.patch \ file://0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch \ file://0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch \ + file://0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch \ " PE = "1" From patchwork Mon Aug 10 04:52:50 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gavini, Sumanth" X-Patchwork-Id: 94839 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 3B189C5AD4E for ; Mon, 10 Aug 2026 04:53:22 +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.23023.1786337596197096000 for ; Sun, 09 Aug 2026 21:53:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=bN7E78BU; 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=26826cd257=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 67A4iwHN1002694 for ; Sun, 9 Aug 2026 21:53:15 -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=x9cpNuI3VIdkbqqHYyIsM4KilmKYjbFbzEUOAFAz9CI=; b= bN7E78BUnbjW40bUeGIGticXtOHT+oByO+4mIPpgOXQ9g1Umt4ynn/6ID5NMcZkY P+uxuzsJsq/DkPuN7y+2ZiJrwZG6uESOU50nxoLXZfbRg6VfxEAGspGjPipBoRJU rm+Ktgm5/T/4aWhh0PcblXAt0G9cYPqO0tuil8RLzekShG8jUgYytRn3Q3JQEI9A TGJxUnjEKTrftLd+azk7Gz02jPQ5UmAPWgzd34xSdXO+ShAPKpVY4l558LDRe3/H 1qsgvQ+ibHr29vnHJpSELd2kPdB/I/965Ypme1Ig9v6vw+mOVbST3tNlJnPgHgrK S7Oae4b22im/Rw1a2ERfOA== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11010012.outbound.protection.outlook.com [52.101.56.12]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4fwyr1smpc-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 09 Aug 2026 21:53:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EuP2+abyIC9/QsBk/HABdqFFd5B0bBhPbPLHt6EH73CC+I/VwUY7X7Q1fa4e6zs/QMq3ePXFNpg+GkNS67v/pn96H8AWv3vtUZdEMRKxc7chIw1xNQHC3kfgmfGCBIWP8v8qmo0YXXqQBFDknVedZHguWr6XLBJU5HPWQ3ji6ZIiudY89/WPcv4Cc6FifK1NQ8deylGLTLwCJXgjJvv9vTLFI2hCjKcxOz0sVx37fDwjh5pycflmiQaCPrEHmvIxfWMRMjNaaS6l/d8vANdU5Le096eKLwvuaDtsRcq8/L9u/KCQCa6rrg2ayhiycYp1BkLvRxLoO01Fo4xhW5ytHw== 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=x9cpNuI3VIdkbqqHYyIsM4KilmKYjbFbzEUOAFAz9CI=; b=bJr5Ey5WKL+KLwJcm9t/ModXUmPhYB/JhjtFDUE1mlt79h5g1LRYnovBnYbqF0xG7WAtyszapT53ksssKpajE4eCy10I0a0Tj0C+DZPuyQockbAFJMdOinZw470sRcFsQVf8t3Vmbc76E03gVnU7ZJxeGRSWgpjZ5yB4QrDTkgdM7L3lhSl8+ARTxSmHBiE380hirRu09E8fDFolLKVJTFdnjdxNz9TtXgoFqIafkbABip6nJZ5fk37cXknQ/zmfbQdAjKBTijTy4Y1C3oMyA7VWnU1mCv2Cn9C/rtlxqxRWCtUUY/XBFUemEMyuQTCOjtXNtPzfc9UhhKGoQuYCWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) by PH7PR11MB7595.namprd11.prod.outlook.com (2603:10b6:510:27a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.292.25; Mon, 10 Aug 2026 04:53:13 +0000 Received: from IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23]) by IA3PR11MB9256.namprd11.prod.outlook.com ([fe80::8355:9462:c4fe:5a23%4]) with mapi id 15.21.0270.016; Mon, 10 Aug 2026 04:53:12 +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 v13 10/10] libarchive: Add RPM format reader to support rpm 6 Date: Sun, 9 Aug 2026 21:52:50 -0700 Message-ID: <20260810045250.3903576-11-sumanth.gavini@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260810045250.3903576-1-sumanth.gavini@windriver.com> References: <20260810045250.3903576-1-sumanth.gavini@windriver.com> X-ClientProxiedBy: SJ0PR05CA0120.namprd05.prod.outlook.com (2603:10b6:a03:334::35) To IA3PR11MB9256.namprd11.prod.outlook.com (2603:10b6:208:57f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA3PR11MB9256:EE_|PH7PR11MB7595:EE_ X-MS-Office365-Filtering-Correlation-Id: fbd745f4-e5b1-4f54-71de-08def69b47d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|23010399003|18002099003|22082099003|13003099007|25016099003|12006099003|38350700014|6133799003|56012099006|11063799006|10067099003|29003799003; X-Microsoft-Antispam-Message-Info: s9L6IH052NuJxlQah1PQJcbRonh6XBDbL2rQgsejDTwiuSwe8jgbdfvcVwAgmacpvyuEEcrorCDA0LfaaiytkMTwwZRmt8CPilQAhRYCgvElbqv8XPWWduQpYjICCZ3OS8kK0kbg84mQDKwNrERNAbmP7jMlkDPLGEqEa3ngT5Hq3JLHyYGyU8GBApWwPiLr5xR4ZuePe0lLP0PTnJIKRc1j1QJRPNdrlkwkxagGUdrtCSpYZ5upaON3FPLuEcscxo24FIEmeryAdPRgaYAtUEZMk5vK58sgItI8NTLP6kLPzzaoh7Dc4dy+HE0sUVYum7SqIOdC4W/rniWfpNY8Z9gIvGB0OGmyX8rFUnQfV2u1rqtN6pKVPpH9SrLW8NeLdYBhmLNj/LfjMHNzJbW38Ug2HlWId/slvSW+eyyJEQvF9uxS4qSWbovBJYSqI0kL5cbDL+ymP/IaKe4i+/lO40/5Rn24P031S3cs/PAKCG6oB64ZUqYKsBX0jH6YVctKHgn7NMp5MDI1AjrrrN/qQ9WCtf8FJitdbDybLmHagc6kZZKzMWK2/LgHISUp1qDJubajea2WSe1ByGKAeXeptaFSF7T5fFiZ2pG92K9mnPJiNu9XXLuxgRi+pUs0kDgB3jC4ti1HTXhcZy022OzNLUOAaNMz0P8auVdS3HCcxA8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA3PR11MB9256.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(23010399003)(18002099003)(22082099003)(13003099007)(25016099003)(12006099003)(38350700014)(6133799003)(56012099006)(11063799006)(10067099003)(29003799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EsGcGYfEsDkNeffS0ydkNIkXSbKE0IQEh4JYKD7Vf3i8Sk0WXYf8Ea3eTTXhVc9nqeX9sDKUAf0SyL/QlexguM7CAnCfAgoLHKy9T3FMDsrhl8tWiinfxlQ1Z/WA9+6gOq7OfR95dSP3Q095P5ARzlSDXQfWS4q9PVNnKdI9yT5YuOhveDv480rh/ByEJOyRHoz+gra5ga0cjoZ1e6muXj+QMmzsUANF51nox0VERzZsaBVx5OJMikujVhDw2eusOv2++yfMQLqLREnS7q4weWWxkYkaQtUI3llQg5UFWLqh6mZkDH+Lj7oYKC9uzkKjGEBVrA/nmSMSSTi1/DrPPQAkZmAJ8HhF96m4vPwcqfRmVpNQklF1nhbawJCWtZupyrvrqkG52X7G691KhCCN3gLlotn7oEBs07lkTlCx9wq0MZFopyDIzIbtN534bP+/xASa/tM4N+ckv3W9I6RntuxpjF+Hogr3N7tnUw69MMtCPHLgo9DfYLfWlyLfUuTvSaZWUfPme+6RPt5/j0NyC9CtTkn7Ga7WcH0iIxO+tb2MpkYRQDS6EEvS4XMF6YoYvFSpl6FjtiylwUbnakRYF7c9PDIiwUr3o1+Jnu3pzLtPQ48pvngpm71d/iI+NT1oJ1ZBPzJ+pTkpsRiBvGnmAB0dhY6ea+SlyRjki7l9Ard9kB7/NiFKlT3TnAyOuAwJbMPOkXut9aZDWX6LZt5fKuJ4sW/gy3n72fNAA5yCF7S3FBI5l2hYVFkHv1vo7kZPEWvFh5DoGhBFgucZT1a/M9Bf9m4cl8NugwM1X5ROmTjYD8CVoN7B8xLfeNWPf7DSpUWqP7IGgxzcWq3qvVb/WbFososxrnahD2o0affO+uTeU9Z0eGCLeHy6dq7wGNxY+SDywTEbH1+q6w9LHhryhSIYSYpNGKI7I+ROoOvsTh/WDuMwdkmWBnSdDHDvhTZTS1DCycyFmW+jeeClW1ZJdprQISMydvKLJBu13AQwxLK/2zhwOuZjTU9F2u4SJ8tiIMZEEapaY3AEEiFOVvd52DdcTjcCkn27TZokN6+JZyiXyMhHHWOeVZn1+RvgGVRWCLnXPKyikyi5RWt9M6VgvAPBKKvRW6PaA49HV3OI6i2GJlN+m1Eh/f+q537+SKse3uOedoA2PLMx3gW127IxRnOu2KadCZfMSNVDHTZZ8mMfUUHv6pkR9SFvZ92kGjB6lQqM942GEUVOI7ChDqX3/td5jeY+1CaCTTPMTHilGgw13z8EsmQ1uyGqvs5fsV6vKXs5yGY3WBg4t7Y/f03MyqmLEB5sPWwr+1KWnKFwVkxsxTI9a69vJSKYLvPmIqiU1kUtgQEhXnxLlsHdL0FvpMGMrqB9d5Yt7cOLk9Y8agnMs4VtYHydS++Al27/OKqPYz/CERGFC+9c6M0EnFFLIh58/taoeODaa8UX0TpauA23twotzvM8OVWw3Jxmn+bwOGnq69/h+0qC6xt7U+Bf+mt7y0q/3XHWaLhy5gD5vehQc2VcIGkOzJ3sRSDKDVApr9hub0ojEoOT5XfDUfRIIS603o8oJKbXIH6MR9czv6uzF0eR+w0ZvoczM+xl2HhEa8hGLIYrK0DCdN4nv+7u1TrRK17RZZeJ4qjlezKT/SiMEfCvEMD4u3L9vvvFUYHuyC4y8AoDFEFJqI+5kaqJgtH8dsCHGqCv2jOveIbsHsJxzOhsCJSi9qtdk6L3usoYcn3ijYBJcHaGHbU2OXk3pbSw+7TcFqFS73vs2tJ9FUs= X-Exchange-RoutingPolicyChecked: EqQ8QTcj/PS8jDkPr6OOp1suZWcThYhTvjSQ7vHhbyZGgRttqos+y0mg52/ILoGCvY36G7OxuR9GnAhZNMoIvILz6cvdUUjDczvnEMfuLzkpMD406KJXTgH1cncRV2S+jL/pAEjRQx5UYWcSrjGrlp4t6WdgVAAPQL1P0I+MSNTjQbS4fAIeIkBr42P/sa1B6VHXqGODxSdWE49FEtbRPPFYWmnKjSGaeOkR+1tTUep6HnKwuKoSnE06yIRZ6VGsg++T5FWBU+X39e68BvidTqfVmGNQQ6xfHc04OwnmINyeL6yjQTpyFENwhmF+9roVX1IlOqi3OnNKo20elSca2Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbd745f4-e5b1-4f54-71de-08def69b47d7 X-MS-Exchange-CrossTenant-AuthSource: IA3PR11MB9256.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2026 04:53:12.0708 (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: ru3uUBZP2yT9oC6XiKmFE/76HRPnbiDHu6XsB2S+9iS44AiOdlPYFwOi+11btCN9cdIqeawpCHJNqXprcUPK67wSlsdGbTMAkNRBZgcPmJo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7595 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX1fKX3aLGOBEJ PhKDXGKT0w/tP2G6WJTEkhBee2yxXRUehyhihS7Lq35Uryn3x90EGsMxfWl7U7mdW5N1mu/UasW anV6xC44U6Qf8g4QKc6bhcR3AETf9Lk0y0JvyWvPDDlHg2vOL2qKfdJGBLjRisRiXa/ZGcdoXHm ROMRP9GHXgeNyspAKZXUFisQO183aHovdOMSNgQSQlu/EuqLW9p78oaPRVUM7aMx/fJSlxDWP/s dP6HabIZaJd2XZipkvtMJRaPrH9zxtQvembuTohquZlnkTLoOYmPjnYW1uEZwHvKaFUitjJSgB9 pFrE4UNlFL1xfQfm9fTFQaVnq/GThM83kypRSwP0FwdhHJpiFUGNs5E3jM4doTknDJDKKAYUC6g bRKurXMIB24oiWHcyINOgdN2QdkEhRmDn5gppk+Jo2QsXoEpq7+b1q+qlwVCVW5iofl2SXEVEHS XYt7kbpOtpgkcqA6wwg== X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDAzOCBTYWx0ZWRfX1uVrp5NuiY3n wHn38Ft0TZ4i7xJDD4ZyHbGRFI05pJK0kyeEG8k8EYkLVvL4v9srYswPzRUGIkQBwsm0GphQvP2 S4RKxCYBwMTv6CMQthVOIqOvk4S/DVdeuP/DjH4WSYv8YLkqkttU X-Authority-Analysis: v=2.4 cv=Z5Lc2nRA c=1 sm=1 tr=0 ts=6a79593b cx=c_pps a=CjRpyDoPu1ZhyeacGh9KdQ==: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=xumDe5_XqNxy1WfVeCAA:9 a=fYNom5PXsM5enKJDCoVv:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-ORIG-GUID: YN7KMmWSzFqTVErQPc94-5SK4M9C97yv X-Proofpoint-GUID: idGwPk3dy5CwhH0cjM9Zfjh_Ysu-GU4q 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-09_07,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100038 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 ; Mon, 10 Aug 2026 04:53:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/243102 * 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 9d7bfef231..f88761fb94 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-append_filter-Verify-that-bidder-and-filter-match.patch \ file://0002-append_filter-Use-last-bidder-for-filter.patch \ file://0003-Remove-bidder-name.patch \ + file://0004-Convert-RPM-reader-into-a-proper-format.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/"