[PATCH v10 0/8] rpm: 4.20.1 -> 6.0.2

[PATCH v10 0/8] rpm: 4.20.1 -> 6.0.2

[Sumanth Gavini]

* v10:
  - The ARCHIVE_FILTER_RPM macro was commented out in a previous
    libarchive change, causing do_compile_ptest_base to fail with:
    error: 'ARCHIVE_FILTER_RPM' undeclared
    Restore the macro definition. The ptest now compiles and passes
    successfully.

* V9:
  - Updated SRCREV to the 6.0.2 tag.
  - Incorporated all V8 changes and updated them as needed for 6.0.2.
  - Dropped
    0001-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch
    from V8, as it is no longer needed. After filtering out the
    /usr/bin/pkg-config file dependency, "bitbake core-image-sato -c
    populate_sdk" completes successfully without the patch.
  - Fixed the filtering of the /usr/bin/pkg-config file dependency.
    pkg-config is a build-time tool, not a runtime dependency. Filtered
    the /usr/bin/pkg-config dependency automatically detected by
    pkgconfig.attr for packages containing .pc files, preventing
    unnecessary hard runtime dependencies in -dev packages.
  - Removed v8 libarchive-related changes since the latest version
   (3.8.8) already includes the required updates.
  - Fixed the "oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native"
    failure observed after upgrading to 6.0.2.
  - Verified that previously reported Autobuilder issues are no longer observed.
    The following builds/tests were successfully completed:
     "bitbake core-image-minimal"
     "bitbake core-image-full-cmdline"
     "bitbake core-image-sato"
     "bitbake core-image-sato world"
     "bitbake core-image-full-cmdline:do_testimage"
     "bitbake core-image-minimal:do_rootfs"
     "bitbake core-image-sato -c populate_sdk"

* V8:
  - Fix build with systemd (Check patch 7 for detailes)
  - Make rpmbuild can find the pkgconfig (.pc) files in /usr/share/pkgconfig 
    (Check patch 7 for detailes)
  - Backport a PULL from git/libarchive to fix oe-selftest failures.

* V7:
  - Add 0001-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch:
    To fix "bitbake core-image-sato -cpopulate_sdk" error on Ubuntu 24.04 when
    pkg-config is installed on host, now the host contamination has been fixed,
    and the patch has been submitted to upstream:
    https://github.com/rpm-software-management/rpm/pull/4127

* V6
  - Fix -cpopulate_sdk error when DISTRO = "poky"

* V5
  - Fix RP's comments: Don't hardcode libc6 into package_rpm.bbclass
  - Use SKIP_LDCONFIG_POSTINST_FRAGMENT:${PN} to fix the loop dependencies
    between /bin/sh and libc.so. 

* V4
  - Fix loop dependencies issues for libc6 and busybox
  - Fix issues for can't find pkg-config files (.pc) on qemux86-64.

* V3
  - Fix Alexender's comments
    a) Suppot rpm 6
    b) Move rpm-setup-autosign to rpm-build
    c) Remove -DLIBELF_FOUND=False

  - Fix build for nativesdk-rpm

  - Drop patch for createrepo-c since it has been upgraded (rev:
    804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)

* V1 & V2
  - Initial version


--
# Sumanth Gavini
# Wind River Linux 

-----------------------------------------------------------------------



Sumanth Gavini (8):
  package_rpm.bbclass: Drop external dependency generator to support rpm
    6
  package_rpm.bbclass: Define _lib and _libdir for rpmbuild
  lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or
    musl
  lib/oe/package.py: Filter out /usr/bin/pkg-config file dependency
  lib/oe/package.py: Don't redirect stderr
  target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES
  rpm: 4.20.1 -> 6.0.2
  libarchive: Make it work with rpm 6

 meta/classes-global/package_rpm.bbclass       |   90 +-
 meta/lib/oe/package.py                        |   19 +-
 meta/recipes-core/glibc/glibc-package.inc     |    5 +
 .../meta/nativesdk-sdk-provides-dummy.bb      |    1 +
 .../meta/target-sdk-provides-dummy.bb         |    1 +
 meta/recipes-core/musl/musl_git.bb            |    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 +-
 ...end_filter-Keep-iterating-even-if-na.patch |   49 +
 ...egister_bidder-Allow-ARCHIVE_STATE_H.patch |   46 +
 ...er-into-a-proper-format-supporting-b.patch | 1673 +++++++++++++++++
 .../libarchive/libarchive_3.8.8.bb            |    3 +
 26 files changed, 2003 insertions(+), 271 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%)
 create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch
 create mode 100644 meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch
 create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch

[PATCH v10 1/8] package_rpm.bbclass: Drop external dependency generator to support rpm 6

[Sumanth Gavini]

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 <liezhi.yang@windriver.com>
Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
---
 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 + "'"

[PATCH v10 2/8] package_rpm.bbclass: Define _lib and _libdir for rpmbuild

[Sumanth Gavini]

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 <liezhi.yang@windriver.com>
Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
---
 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'"

[PATCH v10 3/8] lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or musl

[Sumanth Gavini]

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 <liezhi.yang@windriver.com>
Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
---
 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"

[PATCH v10 4/8] lib/oe/package.py: Filter out /usr/bin/pkg-config file dependency

[Sumanth Gavini]

RPM's pkgconfig.attr fileattr auto-detects /usr/bin/pkg-config as a
Requires dependency for any package that ships .pc files. This causes
every -dev package to have a hard runtime dependency on pkg-config.

pkg-config is a development/build tool used at compile time to locate
libraries and flags via .pc files. It is not required at runtime on the
target.

Without this filter, do_rootfs and do_populate_sdk fail with errors
like:

  Error: nothing provides /usr/bin/pkg-config needed by
  python3-dev-3.14.6-r0.x86_64_v3 from oe-repo

This is triggered when IMAGE_FEATURES includes "ptest-pkgs" or
"dev-pkgs", or when building SDKs, because -dev packages are pulled
in and dnf cannot resolve the /usr/bin/pkg-config file dependency.

The fix filters this dependency at package generation time in
filedeprunner(), consistent with the existing filtering of python()
and perl() auto-dependencies in the same function.

Note: pkgconfig(foo) symbolic dependencies (e.g., pkgconfig(glib-2.0))
are NOT affected by this filter  they continue to work correctly for
build-time dependency resolution.

Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
---
 meta/lib/oe/package.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 8ccd89a190..d210b4a73b 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -253,6 +253,20 @@ def filedeprunner(pkg, pkgfiles, rpmdeps, pkgdest):
             if dep.startswith("python("):
                 continue
 
+            # Ignore the file dependency on /usr/bin/pkg-config. RPM's
+            # pkgconfig.attr fileattr auto-detects this as a Requires for
+            # any package that ships .pc files. However, pkg-config is a
+            # development/build tool used at compile time to locate
+            # libraries and their flags — it is not needed at runtime.
+            # Without this filter, every -dev package would pull in
+            # pkg-config as a hard runtime dependency, causing do_rootfs
+            # and do_populate_sdk failures when pkg-config is not
+            # explicitly included in IMAGE_INSTALL or TOOLCHAIN_TARGET_TASK.
+            # This is consistent with how we already filter python() and
+            # perl() auto-dependencies above.
+            if dep == '/usr/bin/pkg-config':
+                continue
+
             # Ignore all perl(VMS::...) and perl(Mac::...) dependencies. These
             # are typically used conditionally from the Perl code, but are
             # generated as unconditional dependencies.

[PATCH v10 5/8] lib/oe/package.py: Don't redirect stderr

[Sumanth Gavini]

This can make the debug easier.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
---
 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 d210b4a73b..d6617cbac3 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -291,7 +291,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)

[PATCH v10 6/8] target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES

[Sumanth Gavini]

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 <liezhi.yang@windriver.com>
Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
---
 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) \
 "

[PATCH v10 7/8] rpm: 4.20.1 -> 6.0.2

[Sumanth Gavini]

* 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 <sumanth.gavini@windriver.com>
---
 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 <alex.kanavin@gmail.com>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <liezhi.yang@windriver.com>
-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 <liezhi.yang@windriver.com>
----
- 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 <yi.zhao@windriver.com>
-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 <yi.zhao@windriver.com>
----
- 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 <alex.kanavin@gmail.com>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <alex.kanavin@gmail.com>
+
+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 <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
  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 <alex.kanavin@gmail.com>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <alex.kanavin@gmail.com>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini<sumanth.gavini@windriver.com>
 ---
- 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 <alex.kanavin@gmail.com>
 
 Rebased to 4.20.1
+Rebased to 6.0.2
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <alex@linutronix.de>
 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 <alex@linutronix.de>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <changqing.li@windriver.com>
 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 <https://github.com/rpm-software-management/rpm/issues/193>
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <liezhi.yang@windriver.com>
+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 <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
+---
+ 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 <liezhi.yang@windriver.com>
+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 <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
+---
+ 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 <format>
+ #include <string>
+ #include <vector>
+ 
+@@ -105,7 +104,7 @@ static void addSoDep(std::vector<std::string> & 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 <alex.kanavin@gmail.com>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <alex@linutronix.de>
 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 <alex@linutronix.de>
+
+Rebased to 6.0.2
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 <alex.kanavin@gmail.com>
 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 <alex.kanavin@gmail.com>
 
 Rebased to 4.20.1
+Rebased to 6.0.2
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
 ---
- 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 = "\

[PATCH v10 8/8] libarchive: Make it work with rpm 6

[Sumanth Gavini]

The patch is from:
https://github.com/libarchive/libarchive/pull/2846

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: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
---
 ...end_filter-Keep-iterating-even-if-na.patch |   49 +
 ...egister_bidder-Allow-ARCHIVE_STATE_H.patch |   46 +
 ...er-into-a-proper-format-supporting-b.patch | 1673 +++++++++++++++++
 .../libarchive/libarchive_3.8.8.bb            |    3 +
 4 files changed, 1771 insertions(+)
 create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch
 create mode 100644 meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch
 create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch

diff --git a/meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch b/meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch
new file mode 100644
index 0000000000..9de4531103
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch
@@ -0,0 +1,49 @@
+From 26401df2e74e6d72e86fab165445949c9dd3eba9 Mon Sep 17 00:00:00 2001
+From: Davide Beatrici <git@davidebeatrici.dev>
+Date: Sat, 21 Feb 2026 02:55:40 +0100
+Subject: [PATCH 1/3] archive_read_append_filter(): Keep iterating even if name
+ is null
+
+While working on the RPM format I noticed the zstd filter failed to append.
+
+Turns out there are two unknown filters that are registered with a null name:
+
+bidder candidate bzip2
+bidder candidate compress (.Z)
+bidder candidate gzip
+bidder candidate lzip
+bidder candidate lzma
+bidder candidate xz
+bidder candidate uu
+bidder candidate lrzip
+bidder candidate (null)
+bidder candidate (null)
+bidder candidate lz4
+bidder candidate zstd
+
+I'm not sure if anonymous filters are expected behavior, but I believe this change doesn't hurt.
+
+Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
+---
+ libarchive/archive_read_append_filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_read_append_filter.c b/libarchive/archive_read_append_filter.c
+index cd88df11..9475b704 100644
+--- a/libarchive/archive_read_append_filter.c
++++ b/libarchive/archive_read_append_filter.c
+@@ -117,7 +117,7 @@ archive_read_append_filter(struct archive *_a, int code)
+     bidder = a->bidders;
+     for (i = 1; i < number_bidders; i++, bidder++)
+     {
+-      if (!bidder->name || !strcmp(bidder->name, str))
++      if (bidder->name && !strcmp(bidder->name, str))
+         break;
+     }
+     if (!bidder->name || strcmp(bidder->name, str))
+-- 
+2.49.0
+
diff --git a/meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch b/meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch
new file mode 100644
index 0000000000..b3a21330e6
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch
@@ -0,0 +1,46 @@
+From 8eafdb93fd551bfed7184bc7519f5d455811cefb Mon Sep 17 00:00:00 2001
+From: Davide Beatrici <git@davidebeatrici.dev>
+Date: Sat, 21 Feb 2026 05:33:36 +0100
+Subject: [PATCH 2/3] __archive_read_register_bidder(): Allow
+ ARCHIVE_STATE_HEADER, check if already registered
+
+This allows formats to apply filters when they know what they need.
+
+In the case of RPM, that's after parsing the (uncompressed) header.
+
+Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini<sumanth.gavini@windriver.com>
+---
+ libarchive/archive_read.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
+index c9b9d598..bc6305ae 100644
+--- a/libarchive/archive_read.c
++++ b/libarchive/archive_read.c
+@@ -1232,13 +1232,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;
+-- 
+2.49.0
+
diff --git a/meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch b/meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch
new file mode 100644
index 0000000000..dc16a22ce3
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch
@@ -0,0 +1,1673 @@
+From fbafdfbca50b1ae8006b05652dbe3325ef68937a Mon Sep 17 00:00:00 2001
+From: Davide Beatrici <git@davidebeatrici.dev>
+Date: Mon, 27 Jul 2026 13:19:43 -0700
+Subject: [PATCH 3/3] Convert RPM reader into a proper format, supporting both
+stripped CPIO and SVR4
+
+Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Sumanth Gavini <sumanth.gavini@windriver.com>
+---
+ Makefile.am                                   |    2 +-
+ contrib/android/Android.mk                    |    2 +-
+ libarchive/CMakeLists.txt                     |    1 -
+ libarchive/archive.h                          |    4 +-
+ libarchive/archive_read_append_filter.c       |    4 -
+ 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_filter_rpm.c  |  252 ----
+ 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 +-
+ libarchive/test/test_read_format_huge_rpm.c   |    9 +-
+ 16 files changed, 1143 insertions(+), 277 deletions(-)
+ delete mode 100644 libarchive/archive_read_support_filter_rpm.c
+ create mode 100644 libarchive/archive_read_support_format_rpm.c
+
+diff --git a/Makefile.am b/Makefile.am
+index 58bc73e..bc441c1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -191,7 +191,6 @@ libarchive_la_SOURCES= \
+ 	libarchive/archive_read_support_filter_lzop.c \
+ 	libarchive/archive_read_support_filter_none.c \
+ 	libarchive/archive_read_support_filter_program.c \
+-	libarchive/archive_read_support_filter_rpm.c \
+ 	libarchive/archive_read_support_filter_uu.c \
+ 	libarchive/archive_read_support_filter_xz.c \
+ 	libarchive/archive_read_support_filter_zstd.c \
+@@ -208,6 +207,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..d09d721 100644
+--- a/contrib/android/Android.mk
++++ b/contrib/android/Android.mk
+@@ -74,7 +74,6 @@ libarchive_src_files := libarchive/archive_acl.c \
+ 						libarchive/archive_read_support_filter_lzop.c \
+ 						libarchive/archive_read_support_filter_none.c \
+ 						libarchive/archive_read_support_filter_program.c \
+-						libarchive/archive_read_support_filter_rpm.c \
+ 						libarchive/archive_read_support_filter_uu.c \
+ 						libarchive/archive_read_support_filter_xz.c \
+ 						libarchive/archive_read_support_filter_zstd.c \
+@@ -91,6 +90,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..00e52c1 100644
+--- a/libarchive/CMakeLists.txt
++++ b/libarchive/CMakeLists.txt
+@@ -93,7 +93,6 @@ SET(libarchive_SOURCES
+   archive_read_support_filter_lzop.c
+   archive_read_support_filter_none.c
+   archive_read_support_filter_program.c
+-  archive_read_support_filter_rpm.c
+   archive_read_support_filter_uu.c
+   archive_read_support_filter_xz.c
+   archive_read_support_filter_zstd.c
+diff --git a/libarchive/archive.h b/libarchive/archive.h
+index 159a3d5..89e5d42 100644
+--- a/libarchive/archive.h
++++ b/libarchive/archive.h
+@@ -385,6 +385,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 +479,6 @@ __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);
+-__LA_DECL int archive_read_support_filter_rpm(struct archive *);
+ __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 +499,8 @@ __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_append_filter.c b/libarchive/archive_read_append_filter.c
+index 04c3627..44f14c8 100644
+--- a/libarchive/archive_read_append_filter.c
++++ b/libarchive/archive_read_append_filter.c
+@@ -80,10 +80,6 @@ archive_read_append_filter(struct archive *_a, int code)
+       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);
+diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h
+index 0c374f4..7efcf51 100644
+--- a/libarchive/archive_read_private.h
++++ b/libarchive/archive_read_private.h
+@@ -205,7 +205,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..e611c62 100644
+--- a/libarchive/archive_read_support_filter_all.c
++++ b/libarchive/archive_read_support_filter_all.c
+@@ -60,8 +60,6 @@ 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);
+-	/* The decode code doesn't use an outside library. */
+-	archive_read_support_filter_rpm(a);
+ 	/* 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..1c9a405 100644
+--- a/libarchive/archive_read_support_filter_by_code.c
++++ b/libarchive/archive_read_support_filter_by_code.c
+@@ -49,8 +49,6 @@ 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);
+-	case ARCHIVE_FILTER_RPM:
+-		return archive_read_support_filter_rpm(a);
+ 	case ARCHIVE_FILTER_LZIP:
+ 		return archive_read_support_filter_lzip(a);
+ 	case ARCHIVE_FILTER_LRZIP:
+diff --git a/libarchive/archive_read_support_filter_rpm.c b/libarchive/archive_read_support_filter_rpm.c
+deleted file mode 100644
+index 1213df6..0000000
+--- a/libarchive/archive_read_support_filter_rpm.c
++++ /dev/null
+@@ -1,252 +0,0 @@
+-/*-
+- * Copyright (c) 2009 Michihiro NAKAJIMA
+- * 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 <errno.h>
+-#endif
+-#ifdef HAVE_STDLIB_H
+-#include <stdlib.h>
+-#endif
+-
+-#include "archive.h"
+-#include "archive_endian.h"
+-#include "archive_private.h"
+-#include "archive_read_private.h"
+-
+-struct rpm {
+-	int data_reached;
+-};
+-#define RPM_LEAD_SIZE		96	/* Size of 'Lead' section. */
+-#define RPM_MIN_HEAD_SIZE	16	/* Minimum size of 'Head'. */
+-
+-static int	rpm_bidder_bid(struct archive_read_filter_bidder *,
+-		    struct archive_read_filter *);
+-static int	rpm_bidder_init(struct archive_read_filter *);
+-
+-static ssize_t	rpm_filter_read(struct archive_read_filter *,
+-		    const void **);
+-static int	rpm_filter_close(struct archive_read_filter *);
+-
+-#if ARCHIVE_VERSION_NUMBER < 4000000
+-/* Deprecated; remove in libarchive 4.0 */
+-int
+-archive_read_support_compression_rpm(struct archive *a)
+-{
+-	return archive_read_support_filter_rpm(a);
+-}
+-#endif
+-
+-static const struct archive_read_filter_bidder_vtable
+-rpm_bidder_vtable = {
+-	.bid = rpm_bidder_bid,
+-	.init = rpm_bidder_init,
+-};
+-
+-int
+-archive_read_support_filter_rpm(struct archive *_a)
+-{
+-	struct archive_read *a = (struct archive_read *)_a;
+-
+-	return __archive_read_register_bidder(a, NULL, "rpm",
+-			&rpm_bidder_vtable);
+-}
+-
+-static int
+-rpm_bidder_bid(struct archive_read_filter_bidder *self,
+-    struct archive_read_filter *filter)
+-{
+-	const unsigned char *b;
+-	int bits_checked;
+-
+-	(void)self; /* UNUSED */
+-
+-	b = __archive_read_filter_ahead(filter, 8, NULL);
+-	if (b == NULL)
+-		return (0);
+-
+-	bits_checked = 0;
+-	/*
+-	 * Verify Header Magic Bytes : 0XED 0XAB 0XEE 0XDB
+-	 */
+-	if (memcmp(b, "\xED\xAB\xEE\xDB", 4) != 0)
+-		return (0);
+-	bits_checked += 32;
+-	/*
+-	 * Check major version.
+-	 */
+-	if (b[4] != 3 && b[4] != 4)
+-		return (0);
+-	bits_checked += 8;
+-	/*
+-	 * Check package type; binary or source.
+-	 */
+-	if (b[6] != 0)
+-		return (0);
+-	bits_checked += 8;
+-	if (b[7] != 0 && b[7] != 1)
+-		return (0);
+-	bits_checked += 8;
+-
+-	return (bits_checked);
+-}
+-
+-static const struct archive_read_filter_vtable
+-rpm_reader_vtable = {
+-	.read = rpm_filter_read,
+-	.close = rpm_filter_close,
+-};
+-
+-static int
+-rpm_bidder_init(struct archive_read_filter *self)
+-{
+-	struct rpm   *rpm;
+-
+-	self->code = ARCHIVE_FILTER_RPM;
+-	self->name = "rpm";
+-
+-	rpm = calloc(1, sizeof(*rpm));
+-	if (rpm == NULL) {
+-		archive_set_error(&self->archive->archive, ENOMEM,
+-		    "Can't allocate data for rpm");
+-		return (ARCHIVE_FATAL);
+-	}
+-
+-	self->data = rpm;
+-	rpm->data_reached = 0;
+-	self->vtable = &rpm_reader_vtable;
+-
+-	return (ARCHIVE_OK);
+-}
+-
+-static ssize_t
+-skip_padding(struct archive_read_filter *self)
+-{
+-	const unsigned char *h;
+-	ssize_t avail, count, r;
+-
+-	do {
+-		h = __archive_read_filter_ahead(self->upstream, 1, &avail);
+-		if (h == NULL)
+-			return (ARCHIVE_FATAL);
+-		for (count = 0; count < avail && *h++ == '\0'; count++)
+-			;
+-		r = __archive_read_filter_consume(self->upstream, count);
+-		if (r < 0)
+-			return (r);
+-	} while (count == avail);
+-
+-	return (ARCHIVE_OK);
+-}
+-
+-static ssize_t
+-skip_prologue(struct archive_read_filter *self)
+-{
+-	const unsigned char *h;
+-	ssize_t r;
+-	int header, seen_header = 0;
+-
+-	/* Skip lead size. */
+-	r = __archive_read_filter_consume(self->upstream, RPM_LEAD_SIZE);
+-	if (r < 0)
+-		return (r);
+-
+-	do {
+-		/* Read header intro. */
+-		h = __archive_read_filter_ahead(self->upstream,
+-		    RPM_MIN_HEAD_SIZE, NULL);
+-		if (h == NULL)
+-			return (ARCHIVE_FATAL);
+-
+-		header = (memcmp(h, "\x8E\xAD\xE8\x01", 4) == 0);
+-		if (header) {
+-			int64_t bytes, length, section;
+-
+-			seen_header = 1;
+-
+-			/* Calculate header length. */
+-			section = archive_be32dec(h + 8);
+-			bytes = archive_be32dec(h + 12);
+-			length = RPM_MIN_HEAD_SIZE + section * 16 + bytes;
+-
+-			/* Skip header. */
+-			r = __archive_read_filter_consume(self->upstream,
+-			     length);
+-			if (r < 0)
+-				return (r);
+-
+-			/* Skip padding. */
+-			r = skip_padding(self);
+-			if (r != ARCHIVE_OK)
+-				return (r);
+-		}
+-	} while (header);
+-
+-	/* At least one header must have been encountered. */
+-	if (!seen_header) {
+-		archive_set_error(
+-		    &self->archive->archive,
+-		    ARCHIVE_ERRNO_FILE_FORMAT,
+-		    "Unrecognized rpm header");
+-		return (ARCHIVE_FATAL);
+-	}
+-
+-	return (ARCHIVE_OK);
+-}
+-
+-static ssize_t
+-rpm_filter_read(struct archive_read_filter *self, const void **buff)
+-{
+-	struct rpm *rpm;
+-	ssize_t r;
+-
+-	rpm = (struct rpm *)self->data;
+-
+-	if (!rpm->data_reached) {
+-		r = skip_prologue(self);
+-		if (r != ARCHIVE_OK)
+-			return (r);
+-		rpm->data_reached = 1;
+-	}
+-
+-	*buff = __archive_read_filter_ahead(self->upstream, 1, &r);
+-	if (r > 0)
+-		__archive_read_filter_consume(self->upstream, r);
+-
+-	return r;
+-}
+-
+-static int
+-rpm_filter_close(struct archive_read_filter *self)
+-{
+-	struct rpm *rpm;
+-
+-	rpm = (struct rpm *)self->data;
+-	free(rpm);
+-
+-	return (ARCHIVE_OK);
+-}
+-
+diff --git a/libarchive/archive_read_support_format_all.c b/libarchive/archive_read_support_format_all.c
+index 3b53c9a..067f274 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 <errno.h>
++#endif
++
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
++#ifdef HAVE_STRING_H
++#include <string.h>
++#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/libarchive/test/test_read_format_huge_rpm.c b/libarchive/test/test_read_format_huge_rpm.c
+index 51208c7..1bb3703 100644
+--- a/libarchive/test/test_read_format_huge_rpm.c
++++ b/libarchive/test/test_read_format_huge_rpm.c
+@@ -26,6 +26,7 @@
+ 
+ DEFINE_TEST(test_read_format_huge_rpm)
+ {
++	struct archive_entry *ae;
+ 	struct archive *a;
+ 	const char *name = "test_read_format_huge_rpm.rpm";
+ 
+@@ -34,11 +35,9 @@ DEFINE_TEST(test_read_format_huge_rpm)
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ 	extract_reference_file(name);
+ 	/* This archive is truncated -- if it has data, the bid has screwed up */
+-	assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_filename(a, name, 2));
+-	assertEqualStringA(a, "Truncated input file "
+-	    "(needed 34359738384 bytes, only 10256 available)",
+-	    archive_error_string(a));
+-
++	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2));
++        assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
++        assertEqualInt(ARCHIVE_FORMAT_RPM, archive_format(a));
+ 	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+ 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ }
diff --git a/meta/recipes-extended/libarchive/libarchive_3.8.8.bb b/meta/recipes-extended/libarchive/libarchive_3.8.8.bb
index 2c8bf922a6..e82ebf120c 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.8.8.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.8.8.bb
@@ -31,6 +31,9 @@ EXTRA_OECONF += "--enable-largefile --without-iconv"
 
 SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \
            file://run-ptest \
+           file://0001-archive_read_append_filter-Keep-iterating-even-if-na.patch \
+           file://0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch \
+           file://0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch \
           "
 UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
 

Re: [PATCH v10 0/8] rpm: 4.20.1 -> 6.0.2

[Mathieu Dubois-Briand]

On Tue Jul 28, 2026 at 12:55 AM CEST, Sumanth Gavini wrote:
> * v10:
>   - The ARCHIVE_FILTER_RPM macro was commented out in a previous
>     libarchive change, causing do_compile_ptest_base to fail with:
>     error: 'ARCHIVE_FILTER_RPM' undeclared
>     Restore the macro definition. The ptest now compiles and passes
>     successfully.
>
> * V9:
>   - Updated SRCREV to the 6.0.2 tag.
>   - Incorporated all V8 changes and updated them as needed for 6.0.2.
>   - Dropped
>     0001-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch
>     from V8, as it is no longer needed. After filtering out the
>     /usr/bin/pkg-config file dependency, "bitbake core-image-sato -c
>     populate_sdk" completes successfully without the patch.
>   - Fixed the filtering of the /usr/bin/pkg-config file dependency.
>     pkg-config is a build-time tool, not a runtime dependency. Filtered
>     the /usr/bin/pkg-config dependency automatically detected by
>     pkgconfig.attr for packages containing .pc files, preventing
>     unnecessary hard runtime dependencies in -dev packages.
>   - Removed v8 libarchive-related changes since the latest version
>    (3.8.8) already includes the required updates.
>   - Fixed the "oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native"
>     failure observed after upgrading to 6.0.2.
>   - Verified that previously reported Autobuilder issues are no longer observed.
>     The following builds/tests were successfully completed:
>      "bitbake core-image-minimal"
>      "bitbake core-image-full-cmdline"
>      "bitbake core-image-sato"
>      "bitbake core-image-sato world"
>      "bitbake core-image-full-cmdline:do_testimage"
>      "bitbake core-image-minimal:do_rootfs"
>      "bitbake core-image-sato -c populate_sdk"
>
> * V8:
>   - Fix build with systemd (Check patch 7 for detailes)
>   - Make rpmbuild can find the pkgconfig (.pc) files in /usr/share/pkgconfig 
>     (Check patch 7 for detailes)
>   - Backport a PULL from git/libarchive to fix oe-selftest failures.
>
> * V7:
>   - Add 0001-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch:
>     To fix "bitbake core-image-sato -cpopulate_sdk" error on Ubuntu 24.04 when
>     pkg-config is installed on host, now the host contamination has been fixed,
>     and the patch has been submitted to upstream:
>     https://github.com/rpm-software-management/rpm/pull/4127
>
> * V6
>   - Fix -cpopulate_sdk error when DISTRO = "poky"
>
> * V5
>   - Fix RP's comments: Don't hardcode libc6 into package_rpm.bbclass
>   - Use SKIP_LDCONFIG_POSTINST_FRAGMENT:${PN} to fix the loop dependencies
>     between /bin/sh and libc.so. 
>
> * V4
>   - Fix loop dependencies issues for libc6 and busybox
>   - Fix issues for can't find pkg-config files (.pc) on qemux86-64.
>
> * V3
>   - Fix Alexender's comments
>     a) Suppot rpm 6
>     b) Move rpm-setup-autosign to rpm-build
>     c) Remove -DLIBELF_FOUND=False
>
>   - Fix build for nativesdk-rpm
>
>   - Drop patch for createrepo-c since it has been upgraded (rev:
>     804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)
>
> * V1 & V2
>   - Initial version
>
>
> --
> # Sumanth Gavini
> # Wind River Linux 
>

Hi Sumanth,

Thanks for taking care of this series.

So we do have a few fails here:

ERROR: core-image-sato-sdk-1.0-r0 do_rootfs: Could not invoke dnf. Command ...
...
Last metadata expiration check: 0:03:07 ago on Tue 28 Jul 2026 11:03:02 AM UTC.
--> Starting dependency resolution
--> Finished dependency resolution
Error:
 Problem 1: conflicting requests
  - nothing provides pkgconfig(ogg) needed by flac-dev-1.5.0-r0.core2_64 from oe-repo
 Problem 2: conflicting requests
  - nothing provides pkgconfig(libxml-2.0) needed by libcomps-dev-0.1.24-r0.core2_64 from oe-repo
 Problem 3: conflicting requests
  - nothing provides pkgconfig(ncurses) needed by libreadline-dev-8.3-r0.core2_64 from oe-repo
 Problem 4: package libsndfile-dev-1.2.2-r0.core2_64 from oe-repo requires flac-dev, but none of the providers can be installed
  - conflicting requests
  - nothing provides pkgconfig(ogg) needed by flac-dev-1.5.0-r0.core2_64 from oe-repo
(try to add '--skip-broken' to skip uninstallable packages)

It does happen with a few different packages.

https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/4248
https://autobuilder.yoctoproject.org/valkyrie/#/builders/19/builds/4228
https://autobuilder.yoctoproject.org/valkyrie/#/builders/30/builds/4210
https://autobuilder.yoctoproject.org/valkyrie/#/builders/40/builds/4211

Also, we do have selftest failures:

2026-07-28 10:37:28,088 - oe-selftest - INFO - runtime_test.Postinst.test_failing_postinst (subunit.RemotedTestCase)
2026-07-28 10:37:28,093 - oe-selftest - INFO -  ... FAIL
...
2026-07-28 10:37:28,094 - oe-selftest - INFO - 5: 27/36 299/763 (127.74s) (0 failed) (runtime_test.Postinst.test_failing_postinst)
2026-07-28 10:37:28,094 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/layers/openembedded-core/meta/lib/oeqa/selftest/cases/runtime_test.py", line 409, in test_failing_postinst
    self.assertGreaterEqual(bb_result.output.find("Postinstall scriptlets of ['postinst-rootfs-failing'] have failed."), 0,
    ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
        "Warning about a failed scriptlet not found in bitbake output: %s" %(bb_result.output))
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/python3.13/unittest/case.py", line 1297, in assertGreaterEqual
    self.fail(self._formatMessage(msg, standardMsg))
    ~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/python3.13/unittest/case.py", line 732, in fail
    raise self.failureException(msg)
AssertionError: -1 not greater than or equal to 0 : Warning about a failed scriptlet not found in bitbake output: NOTE: Reconnecting to bitbake server...
...
ERROR: core-image-minimal-1.0-r0 do_rootfs: Could not invoke dnf. Command '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf -v --rpmverbosity=info -y -c /srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/dnf/dnf.conf --setopt=reposdir=/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/yum.repos.d --installroot=/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs --setopt=logdir=/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/temp --repofrompath=oe-repo,/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/oe-rootfs-repo --nogpgcheck install packagegroup-core-boot postinst-rootfs-failing run-postinsts ssh-pregen-hostkeys' returned 1:
...
Error in POSTIN scriptlet in rpm package postinst-rootfs-failing
  Installing       : update-rc.d-0.8+git0+b8f9501050-r0.noarch            37/40
  Installing       : ldconfig-2.44+git0+7cba77790f-r0.x86_64_v3           38/40
  Installing       : ssh-pregen-hostkeys-1.0-r0.x86_64_v3                 39/40
  Installing       : openssl-conf-3.5.7-r0.x86_64_v3                      40/40Error: Could not run transaction.

https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/4394
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/4213
https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/4458

Can you have a look at the issues?

Thanks,
Mathieu

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH v10 0/8] rpm: 4.20.1 -> 6.0.2

[Gavini, Sumanth]

On 7/28/2026 10:18 AM, Mathieu Dubois-Briand via lists.openembedded.org 
wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
> 
> On Tue Jul 28, 2026 at 12:55 AM CEST, Sumanth Gavini wrote:
>> * v10:
>>    - The ARCHIVE_FILTER_RPM macro was commented out in a previous
>>      libarchive change, causing do_compile_ptest_base to fail with:
>>      error: 'ARCHIVE_FILTER_RPM' undeclared
>>      Restore the macro definition. The ptest now compiles and passes
>>      successfully.
>>
>> * V9:
>>    - Updated SRCREV to the 6.0.2 tag.
>>    - Incorporated all V8 changes and updated them as needed for 6.0.2.
>>    - Dropped
>>      0001-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch
>>      from V8, as it is no longer needed. After filtering out the
>>      /usr/bin/pkg-config file dependency, "bitbake core-image-sato -c
>>      populate_sdk" completes successfully without the patch.
>>    - Fixed the filtering of the /usr/bin/pkg-config file dependency.
>>      pkg-config is a build-time tool, not a runtime dependency. Filtered
>>      the /usr/bin/pkg-config dependency automatically detected by
>>      pkgconfig.attr for packages containing .pc files, preventing
>>      unnecessary hard runtime dependencies in -dev packages.
>>    - Removed v8 libarchive-related changes since the latest version
>>     (3.8.8) already includes the required updates.
>>    - Fixed the "oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native"
>>      failure observed after upgrading to 6.0.2.
>>    - Verified that previously reported Autobuilder issues are no longer observed.
>>      The following builds/tests were successfully completed:
>>       "bitbake core-image-minimal"
>>       "bitbake core-image-full-cmdline"
>>       "bitbake core-image-sato"
>>       "bitbake core-image-sato world"
>>       "bitbake core-image-full-cmdline:do_testimage"
>>       "bitbake core-image-minimal:do_rootfs"
>>       "bitbake core-image-sato -c populate_sdk"
>>
>> * V8:
>>    - Fix build with systemd (Check patch 7 for detailes)
>>    - Make rpmbuild can find the pkgconfig (.pc) files in /usr/share/pkgconfig
>>      (Check patch 7 for detailes)
>>    - Backport a PULL from git/libarchive to fix oe-selftest failures.
>>
>> * V7:
>>    - Add 0001-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch:
>>      To fix "bitbake core-image-sato -cpopulate_sdk" error on Ubuntu 24.04 when
>>      pkg-config is installed on host, now the host contamination has been fixed,
>>      and the patch has been submitted to upstream:
>>      https://github.com/rpm-software-management/rpm/pull/4127
>>
>> * V6
>>    - Fix -cpopulate_sdk error when DISTRO = "poky"
>>
>> * V5
>>    - Fix RP's comments: Don't hardcode libc6 into package_rpm.bbclass
>>    - Use SKIP_LDCONFIG_POSTINST_FRAGMENT:${PN} to fix the loop dependencies
>>      between /bin/sh and libc.so.
>>
>> * V4
>>    - Fix loop dependencies issues for libc6 and busybox
>>    - Fix issues for can't find pkg-config files (.pc) on qemux86-64.
>>
>> * V3
>>    - Fix Alexender's comments
>>      a) Suppot rpm 6
>>      b) Move rpm-setup-autosign to rpm-build
>>      c) Remove -DLIBELF_FOUND=False
>>
>>    - Fix build for nativesdk-rpm
>>
>>    - Drop patch for createrepo-c since it has been upgraded (rev:
>>      804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)
>>
>> * V1 & V2
>>    - Initial version
>>
>>
>> --
>> # Sumanth Gavini
>> # Wind River Linux
>>
> 
> Hi Sumanth,
> 
> Thanks for taking care of this series.
> 
> So we do have a few fails here:
> 
> ERROR: core-image-sato-sdk-1.0-r0 do_rootfs: Could not invoke dnf. Command ...
> ...
> Last metadata expiration check: 0:03:07 ago on Tue 28 Jul 2026 11:03:02 AM UTC.
> --> Starting dependency resolution
> --> Finished dependency resolution
> Error:
>   Problem 1: conflicting requests
>    - nothing provides pkgconfig(ogg) needed by flac-dev-1.5.0-r0.core2_64 from oe-repo
>   Problem 2: conflicting requests
>    - nothing provides pkgconfig(libxml-2.0) needed by libcomps-dev-0.1.24-r0.core2_64 from oe-repo
>   Problem 3: conflicting requests
>    - nothing provides pkgconfig(ncurses) needed by libreadline-dev-8.3-r0.core2_64 from oe-repo
>   Problem 4: package libsndfile-dev-1.2.2-r0.core2_64 from oe-repo requires flac-dev, but none of the providers can be installed
>    - conflicting requests
>    - nothing provides pkgconfig(ogg) needed by flac-dev-1.5.0-r0.core2_64 from oe-repo
> (try to add '--skip-broken' to skip uninstallable packages)
> 
> It does happen with a few different packages.
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/4248
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/19/builds/4228
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/30/builds/4210
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/40/builds/4211
> 
> Also, we do have selftest failures:
> 
> 2026-07-28 10:37:28,088 - oe-selftest - INFO - runtime_test.Postinst.test_failing_postinst (subunit.RemotedTestCase)
> 2026-07-28 10:37:28,093 - oe-selftest - INFO -  ... FAIL
> ...
> 2026-07-28 10:37:28,094 - oe-selftest - INFO - 5: 27/36 299/763 (127.74s) (0 failed) (runtime_test.Postinst.test_failing_postinst)
> 2026-07-28 10:37:28,094 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
>    File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/layers/openembedded-core/meta/lib/oeqa/selftest/cases/runtime_test.py", line 409, in test_failing_postinst
>      self.assertGreaterEqual(bb_result.output.find("Postinstall scriptlets of ['postinst-rootfs-failing'] have failed."), 0,
>      ~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>          "Warning about a failed scriptlet not found in bitbake output: %s" %(bb_result.output))
>          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>    File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/python3.13/unittest/case.py", line 1297, in assertGreaterEqual
>      self.fail(self._formatMessage(msg, standardMsg))
>      ~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>    File "/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/python3.13/unittest/case.py", line 732, in fail
>      raise self.failureException(msg)
> AssertionError: -1 not greater than or equal to 0 : Warning about a failed scriptlet not found in bitbake output: NOTE: Reconnecting to bitbake server...
> ...
> ERROR: core-image-minimal-1.0-r0 do_rootfs: Could not invoke dnf. Command '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/recipe-sysroot-native/usr/bin/dnf -v --rpmverbosity=info -y -c /srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/dnf/dnf.conf --setopt=reposdir=/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs/etc/yum.repos.d --installroot=/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/rootfs --setopt=logdir=/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/temp --repofrompath=oe-repo,/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-71494/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0/oe-rootfs-repo --nogpgcheck install packagegroup-core-boot postinst-rootfs-failing run-postinsts ssh-pregen-hostkeys' returned 1:
> ...
> Error in POSTIN scriptlet in rpm package postinst-rootfs-failing
>    Installing       : update-rc.d-0.8+git0+b8f9501050-r0.noarch            37/40
>    Installing       : ldconfig-2.44+git0+7cba77790f-r0.x86_64_v3           38/40
>    Installing       : ssh-pregen-hostkeys-1.0-r0.x86_64_v3                 39/40
>    Installing       : openssl-conf-3.5.7-r0.x86_64_v3                      40/40Error: Could not run transaction.
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/4394
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/4213
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/4458
> 
> Can you have a look at the issues?
> 
> Thanks,
> Mathieu
> 
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#242197): https://lists.openembedded.org/g/openembedded-core/message/242197
> Mute This Topic: https://lists.openembedded.org/mt/120476095/10534619
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [sumanth.gavini@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 
Hi Mathieu,

Sure, I'll address it and send a v11 patch.

-- 
# Sumanth Gavini
# Wind River Linux