rpm: 4.20.1 -> 6.0.2
v18 cover rpm: 4.20.1 -> 6.0.2
* V18:
- patch 01-09: unchanged from v17.
- patch 10: split into two patches based on richard comments.
- patch 11-14: no code changes; patch numbering updated to 12-15.
- Added "package_rpm.bbclass: filter pkgconfig() deps regardless of generator state" (0016 patch). Fixes the reproducibility failure Mathieu reported on v17 (pkgconfig() Provides/Requires differing between reproducibleA/reproducibleB-extended on hicolor-icon-theme-dev and others). __pkgconfig_provides/__pkgconfig_requires %{nil} don't reliably suppress RPM 6's generator; adds __requires_exclude/__provides_exclude as an unconditional filter.
* V17:
- patch 14: replaced non-ASCII arrow with ASCII in commit message to fix DKIM signature verification failure on patch 14( v16 patch 14 could not be applied via b4 due to BADSIG)
- all other patches identical to v16
* V16:
- patch 01-09: unchanged from v15
- patch 10: updated - rename target path from pkg-config_3.0.5.bb to pkg-config_3.0.6.bb to track the pkg-config version bump that occured after v15 was submitted
- patches 11-12: unchanged from v15
- Added "package_rpm.bbclass: suppress RPM 6 fileattr dependency generators" (0013 patch). Suppress all RPM 6 per-filetype fileattr dep generator macros
- Added "lib/oe/package_manager/rpm: handle RPM 6 non-zero exit on %post failure" (0014 patch). RPM 6 #3819 causes rpmtsRun() to return -1 for warn-only %post failures via ts->scriptError; intercept in _invoke_dnf() so install_pkgs()'s existing scriptlet scan runs as it did with RPM 4.
* V15:
- package_rpm.bbclass: Suppress pkgconfig() Requires for sstate compatibility.
- lib/oe/package_manager/rpm: Enable DNF filelists to resolve file-based deps.
* V14:
- Dropped "rpm: filter /usr/bin/pkg-config from RPM auto-generated Requires" (pkgconfigdeps.sh patch). Per Ross Burton's review, instead of suppressing the /usr/bin/pkg-config emission, added:
RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config"
to the pkgconf recipe so it satisfies the auto-generated Requires without modifying the upstream rpm script.
- Removed /usr/bin/pkg-config from nativesdk-sdk-provides-dummy.bb. RPM 6's internal dependency generator auto-detects file-level Provides from installed files, so nativesdk-pkgconf already provides /usr/bin/pkg-config via the wrapper script it installs. Keeping the dummy entry caused a DNF conflict during do_populate_sdk:
nativesdk-sdk-provides-dummy conflicts with /usr/bin/pkg-config provided by nativesdk-pkgconf
- Added "libarchive: Disable RPM filter auto-bidding" (0005 patch). With both the RPM filter and RPM format reader registered, the filter intercepted RPM files first and failed to parse RPM 6 packages (debuginfod scanning still failed after the 0004 patch). Disabling the filter's automatic bidding lets the format reader handle RPM files, while archive_read_append_filter(ARCHIVE_FILTER_RPM) still works explicitly, keeping test_read_append_rpm_filter passing.
- Updated 0004-Convert-RPM-reader-into-a-proper-format.patch to include the test_read_format_huge_rpm.c changes from upstream PR #2846. This test now correctly exercises the format reader instead of the filter.
- Updated patches 7,9 and 10 for the latest master changes; no code changes; removed upstream modifications
Tests verified:
- oe-selftest -r debuginfod.Debuginfod.test_debuginfod_qemu
- oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native
- oe-selftest -r sdk.SDKTests.test_sdk_manifests
- oe-selftest -r sdk.SDKTests.test_sdk_runqemu
- bitbake core-image-ptest-libarchive:do_testimage
- bitbake core-image-sato -c populate_sdk
- bitbake core-image-sato-sdk:do_rootfs
* V13:
- Added "rpm: Fix pkgconfig() Provides missing in cross-built RPMs" Unset cross-compilation PKG_CONFIG_* variables in pkgconfigdeps.sh so pkgconfig() Provides/Requires are correctly generated during rpmbuild.
- Added "libarchive: Add RPM format reader to support rpm 6" PR #3346 from v12 was insufficient alone. Added PR #2846 patch that converts RPM into a proper format reader for RPM 6 packages. Existing RPM filter kept for API compatibility. test_read_format_huge_rpm.c excluded (filter intercepts before format reader).
Tests verified:
- oe-selftest -r debuginfod.Debuginfod.test_debuginfod_qemu
- bitbake core-image-ptest-libarchive:do_testimage (libarchive_test PASS)
- bitbake core-image-sato:do_populate_sdk
- bitbake core-image-sato-sdk: do_rootfs
* V12:
- The previous libarchive-related changes for 3.8.8 are no longer applicable because libarchive has been upgraded to 3.8.9. Updated the implementation to work with libarchive 3.8.9 and applied the upstream fix for "attach filter to correct bidder".
Upstream patch: Upstream patch:
https://github.com/libarchive/libarchive/pull/3346/
- Dropped the following changes:
rpm: lib/oe/package.py: Filter out /usr/bin/pkg-config file dependency
rpm: Filter /usr/bin/pkg-config from RPM auto-generated Requires
Why drop the old change:
The filedeprunner() fix runs at OE's external scanning stage (do_package), but RPM 6's internal dependency generator runs later, inside rpmbuild itself. It re-adds Requires:
/usr/bin/pkg-config regardless of what OE filtered. The old fix simply operates at the wrong layer it's like closing a door that RPM 6 walks around.
Why the new changes:
It operates at the same layer where the problem originates, inside rpmbuild. By setting __pkgconfig_provides and __pkgconfig_requires to %{nil}, we tell RPM 6's internal
scanner to skip pkgconfigdeps.sh entirely. This is the RPM 6 equivalent of what _use_internal_dependency_generator 0 did in RPM 4 just scoped to pkgconfig specifically rather than globally.
With these changes, the previously observed test failures have been resolved:
- bitbake core-image-sato:do_populate_sdk
- bitbake core-image-sato-sdk: do_rootfs
- bitbake core-image-ptest-glib-2.0
- bitbake core-image-ptest-libarchive
- bitbake core-image-ptest-libarchive:do_testimage
* V11:
- Added 0001-pkgconfigdeps.sh-Do-not-emit-usr-bin-pkg-config-as-a.patch To fix "bitbake core-image-minimal-dev" Could not invoke dnf. Command... pkgconfigdeps.sh unconditionally emits /usr/bin/pkg-config as a hard Requires for packages shipping .pc files. In OE/Yocto cross-compilation, pkg-config is a host-only build tool not needed on the target rootfs, causing failures with -dev packages.
* 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 (16):
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: 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.0.2
rpm: Fix pkgconfig() Provides missing in cross-built RPMs
libarchive: Add RPM format reader to support rpm 6
pkgconf: add /usr/bin/pkg-config to RPROVIDES
libarchive: Disable RPM filter auto-bidding and update huge_rpm test package_rpm.bbclass: Suppress pkgconfig() Requires for sstate
compatibility
lib/oe/package_manager/rpm: Enable DNF filelists to resolve file deps package_rpm.bbclass: suppress RPM 6 fileattr dependency generators lib/oe/package_manager/rpm: handle RPM 6 non-zero exit on %post
failure
package_rpm.bbclass: filter pkgconfig() deps regardless of generator
state
meta/classes-global/package_rpm.bbclass | 105 +-
meta/lib/oe/package.py | 5 +-
meta/lib/oe/package_manager/rpm/__init__.py | 10 +-
meta/recipes-core/glibc/glibc-package.inc | 5 +
.../meta/target-sdk-provides-dummy.bb | 1 +
meta/recipes-core/musl/musl_git.bb | 4 +
.../recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +-
...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 +-
...Unset-cross-compilation-PKG_CONFIG-v.patch | 71 +
...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} | 15 +-
...-Verify-that-bidder-and-filter-match.patch | 103 ++
.../libarchive/0003-Remove-bidder-name.patch | 258 +++
...vert-RPM-reader-into-a-proper-format.patch | 1440 +++++++++++++++++
...0005-Disable-RPM-filter-auto-bidding.patch | 73 +
.../libarchive/libarchive_3.8.9.bb | 4 +
29 files changed, 2192 insertions(+), 273 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
create mode 100644 meta/recipes-devtools/rpm/files/0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch
rename meta/recipes-devtools/rpm/{rpm_4.20.1.bb => rpm_6.0.2.bb} (95%)
create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Remove-bidder-name.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patchPATCH v18 1/16 package_rpm.bbclass: Drop external dependency generator to support rpm 6
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.
--- meta/classes-global/package_rpm.bbclass | 84 +------------------------ 1 file changed, 3 insertions(+), 81 deletions(-)
meta/classes-global/package_rpm.bbclass +3 -81
@@ -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 v18 2/16 package_rpm.bbclass: Define _lib and _libdir for rpmbuild
In reply to Sumanth GaviniThe 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.
--- meta/classes-global/package_rpm.bbclass | 2 ++ 1 file changed, 2 insertions(+)
meta/classes-global/package_rpm.bbclass +2 -0
@@ -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 v18 3/16 lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or musl
In reply to Sumanth GaviniFixed:
$ 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.
--- 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(-)
meta/lib/oe/package.py +2 -1
@@ -1852,7 +1852,8 @@ def process_shlibs(pkgfiles, d): if s[0] not in shlib_provider: shlib_provider[s[0]] = {} shlib_provider[s[0]][s[1]] = (pkg, pkgver) - if needs_ldconfig: + if needs_ldconfig and \ + not bb.utils.to_boolean(d.getVar('SKIP_LDCONFIG_POSTINST_FRAGMENT:%s' % pkg)): bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) postinst = d.getVar('pkg_postinst:%s' % pkg) if not postinst:
meta/recipes-core/glibc/glibc-package.inc +5 -0
@@ -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"
meta/recipes-core/musl/musl_git.bb +4 -0
@@ -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 v18 4/16 lib/oe/package.py: Don't redirect stderr
In reply to Sumanth GaviniThis can make the debug easier.
--- meta/lib/oe/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package.py +1 -1
@@ -277,7 +277,7 @@ def filedeprunner(pkg, pkgfiles, rpmdeps, pkgdest): return provides, requires - output = subprocess.check_output(shlex.split(rpmdeps) + pkgfiles, stderr=subprocess.STDOUT).decode("utf-8") + output = subprocess.check_output(shlex.split(rpmdeps) + pkgfiles).decode("utf-8") provides, requires = process_deps(output, pkg, pkgdest, provides, requires) return (pkg, provides, requires)
PATCH v18 5/16 target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES
In reply to Sumanth GaviniThe 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
--- 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(+)
meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +1 -0
@@ -11,6 +11,7 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ + /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \ "
meta/recipes-core/meta/target-sdk-provides-dummy.bb +1 -0
@@ -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 v18 6/16 rpm: 4.20.1 -> 6.0.2
In reply to 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
---
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%)meta/classes-global/package_rpm.bbclass +4 -0
@@ -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')
meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch +13 -9
@@ -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 <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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
meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch deleted +0 -46
46 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch deleted +0 -50
50 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch +11 -7
@@ -9,16 +9,20 @@ hand produces rpms that way by design. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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) {
meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +8 -16
@@ -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 <[email protected]> + +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 <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- 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
meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch +11 -7
@@ -5,15 +5,19 @@ Subject: [PATCH] Do not read config files from $HOME Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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", ":",
meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch +10 -6
@@ -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 <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini<[email protected]> --- - 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;
meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch +7 -5
@@ -26,15 +26,17 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> Rebased to 4.20.1 +Rebased to 6.0.2 Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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 */
meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch +11 -7
@@ -1,7 +1,7 @@ From e688eb54fd54d65181e94b854b3568d99cbf3a24 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> 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 <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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';
meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch +11 -7
@@ -1,7 +1,7 @@ From ad530868e37f09e9236c085d25a834304750704b Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> 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 <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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;
meta/recipes-devtools/rpm/files/0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 1cb53934b83b794c319813106c9f12d75cce66d2 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> +--- + 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 +
meta/recipes-devtools/rpm/files/0001-tools-elfdeps.cc-Remove-format-module.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 3536ef6bb74144cf9dce10200cd62c2ad9f7cae4 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +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 <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> +--- + 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 +
meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch +15 -11
@@ -9,15 +9,19 @@ from target rootfs instead of its own native sysroot. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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;
meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch +9 -5
@@ -1,7 +1,7 @@ From d8972ff7fa0a30e199144ba135223bf561874e01 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> 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 <[email protected]> + +Rebased to 6.0.2 +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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"
meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch +8 -6
@@ -1,7 +1,7 @@ From 452b696ea3e1975ea30cf7a92678aa4b316e6300 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> 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 <[email protected]> Rebased to 4.20.1 +Rebased to 6.0.2 Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> --- - 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;
meta/recipes-devtools/rpm/rpm_6.0.2.bb renamed from meta/recipes-devtools/rpm/rpm_4.20.1.bb +8 -6
@@ -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 = "\
Hello,
Quoted 2 lines · Sumanth Gavini via lists.openembedded.org
* Add a tag to
SRC_URIso that there will be errors when only change the filename during upgrade it, as suggested by Alexander.
^ this part of the commit message does not match the code below:
[...]
meta/recipes-devtools/rpm/rpm_6.0.2.bb HOMEPAGE = "http://www.rpm.org" · line 27
Quoted 13 lines
meta/recipes-devtools/rpm/rpm_6.0.2.bb renamed from meta/recipes-devtools/rpm/rpm_4.20.1.bb +1
-1@@ -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 \
^ not "tag=..."
meta/recipes-devtools/rpm/rpm_6.0.2.bb HOMEPAGE = "http://www.rpm.org" · line 30
Quoted 3 lines
meta/recipes-devtools/rpm/rpm_6.0.2.bb renamed from meta/recipes-devtools/rpm/rpm_4.20.1.bb +0
-0file://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 \
As discussed during the patch review call, Richard will most likely merge this with a commit message tweak.
Maybe consider sending the tag= addition as a followup patch.
Thanks!
Signature · 2 lines
Yoann Congal Smile ECS
PATCH v18 7/16 libarchive: Make it work with rpm 6.0.2
In reply to Sumanth GaviniThe patch is from:
https://github.com/libarchive/libarchive/pull/3346/
Fixed:
$ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native
cannot open archive from pipe /path/to/tmp-debuginfod/work/x86-64-v3-poky-linux/xz/5.8.2/localpkgfeed/x86_64_v3/bash-locale-vi-5.3-r0.x86_64_v3.rpm libarchive error: cannot open archive from pipe: Unrecognized archive format
exceptions encountered during archive scan
Note: 0001-append_filter-Use-last-bidder-for-filter.patch was already present from upstream, so only the remaining two PR #3346 patches are added here.
--- ...-Verify-that-bidder-and-filter-match.patch | 103 +++++++ .../libarchive/0003-Remove-bidder-name.patch | 258 ++++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 2 + 3 files changed, 363 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Remove-bidder-name.patch
meta/recipes-extended/libarchive/libarchive/0001-append_filter-Verify-that-bidder-and-filter-match.patch new file +103 -0
@@ -0,0 +1,103 @@ +From db4fb440792278cd01e0829c93f6b62f567b704b Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann <[email protected]> +Date: Sun, 2 Aug 2026 14:26:22 +0200 +Subject: [PATCH 1/3] append_filter: Verify that bidder and filter match + +Make sure that appending a filter always matches its supposed bidder. + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/3346] +Signed-off-by: Tobias Stoeckmann <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> +--- + Makefile.am | 1 + + libarchive/test/CMakeLists.txt | 1 + + .../test/test_archive_read_append_filter.c | 54 +++++++++++++++++++ + 3 files changed, 56 insertions(+) + create mode 100644 libarchive/test/test_archive_read_append_filter.c + +diff --git a/Makefile.am b/Makefile.am +index 2fb4fdf4..c96b3bc6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -404,6 +404,7 @@ libarchive_test_SOURCES= \ + libarchive/test/test_archive_pathmatch_oob.c \ + libarchive/test/test_archive_read.c \ + libarchive/test/test_archive_read_add_passphrase.c \ ++ libarchive/test/test_archive_read_append_filter.c \ + libarchive/test/test_archive_read_close_twice.c \ + libarchive/test/test_archive_read_multiple_data_objects.c \ + libarchive/test/test_archive_read_next_header_empty.c \ +diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt +index 44f839f8..c4102c3d 100644 +--- a/libarchive/test/CMakeLists.txt ++++ b/libarchive/test/CMakeLists.txt +@@ -33,6 +33,7 @@ IF(ENABLE_TEST) + test_archive_pathmatch_oob.c + test_archive_read.c + test_archive_read_add_passphrase.c ++ test_archive_read_append_filter.c + test_archive_read_close_twice.c + test_archive_read_multiple_data_objects.c + test_archive_read_next_header_empty.c +diff --git a/libarchive/test/test_archive_read_append_filter.c b/libarchive/test/test_archive_read_append_filter.c +new file mode 100644 +index 00000000..5c301d52 +--- /dev/null ++++ b/libarchive/test/test_archive_read_append_filter.c +@@ -0,0 +1,54 @@ ++/*- ++ * Copyright (c) 2026 Tobias Stoeckmann ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include "archive.h" ++#include "test.h" ++ ++DEFINE_TEST(test_archive_read_append_filter) ++{ ++ struct archive *a; ++ int r; ++ ++ a = archive_read_new(); ++ assert(a != NULL); ++ ++ /* Append a program bidder (without filter). */ ++ assertEqualIntA(a, ARCHIVE_OK, ++ archive_read_support_filter_program(a, "prog1")); ++ ++ /* Append a filter program which comes with its own bidder. */ ++ r = archive_read_append_filter_program(a, "prog2"); ++ ++ /* Verify that filter uses its own bidder. */ ++ if (r == ARCHIVE_FATAL) { ++ assertEqualStringA(a, "Can't initialize filter; unable to run program \"prog2\"", ++ archive_error_string(a)); ++ } else { ++ assertEqualIntA(a, ARCHIVE_OK, r); ++ assertEqualStringA(a, "Program: prog2", archive_filter_name(a, 0)); ++ } ++ ++ archive_read_free(a); ++} +-- +2.49.0
meta/recipes-extended/libarchive/libarchive/0003-Remove-bidder-name.patch new file +258 -0
258 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive_3.8.9.bb +2 -0
@@ -33,6 +33,8 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://run-ptest \ file://0001-append_filter-Use-last-bidder-for-filter.patch \ file://0001-test-skip-ppmd8-aes256-streaming-test-when-no-crypto.patch \ + file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ + file://0003-Remove-bidder-name.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
PATCH v18 8/16 rpm: Fix pkgconfig() Provides missing in cross-built RPMs
In reply to Sumanth Gavini* Added 0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch
- rpm 6's internal dependency generator runs pkgconfigdeps.sh during rpmbuild, but OE's cross-build environment exports PKG_CONFIG_SYSROOT_DIR which causes pkg-config --print-provides to silently fail on .pc files in the package buildroot.
Unset cross-compilation PKG_CONFIG_* variables in pkgconfigdeps.sh so that pkgconfig() Provides/Requires are correctly generated.
Without this fix, do_rootfs fails with errors like:
nothing provides pkgconfig(ogg) needed by flac-dev
--- ...Unset-cross-compilation-PKG_CONFIG-v.patch | 71 +++++++++++++++++++ meta/recipes-devtools/rpm/rpm_6.0.2.bb | 1 + 2 files changed, 72 insertions(+) create mode 100644 meta/recipes-devtools/rpm/files/0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch
meta/recipes-devtools/rpm/files/0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch new file +71 -0
@@ -0,0 +1,71 @@ +From a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0 Mon Sep 17 00:00:00 2001 +From: Sumanth Gavini <[email protected]> +Date: Tue, 04 Aug 2026 23:30:00 -0700 +Subject: [PATCH] pkgconfigdeps.sh: Unset cross-compilation PKG_CONFIG variables + +In OpenEmbedded/Yocto cross-compilation environments, several +PKG_CONFIG_* environment variables are set to point pkg-config at the +target sysroot for recipe builds: + + PKG_CONFIG_SYSROOT_DIR=".../recipe-sysroot" + PKG_CONFIG_LIBDIR=".../recipe-sysroot/usr/lib/pkgconfig:..." + PKG_CONFIG_SYSTEM_INCLUDE_PATH=".../recipe-sysroot/usr/include" + PKG_CONFIG_SYSTEM_LIBRARY_PATH=".../recipe-sysroot/lib:..." + +These variables persist into the do_package_write_rpm task environment. +When rpmbuild's internal dependency generator invokes pkgconfigdeps.sh, +the script calls pkg-config --print-provides and --print-requires on .pc +files located in the package buildroot directory (e.g., +.../package/usr/lib/pkgconfig/ogg.pc). + +With PKG_CONFIG_SYSROOT_DIR set, pkg-config fails silently (exit 1, no +output) when querying these .pc files because it attempts to validate +paths with the sysroot prefix prepended, which doesn't match the +buildroot location. This causes all pkgconfig(...) Provides and Requires +to be missing from the generated RPMs. + +The result is do_rootfs failures like: + nothing provides pkgconfig(ogg) needed by flac-dev + nothing provides pkgconfig(libxml-2.0) needed by libcomps-dev + nothing provides pkgconfig(ncurses) needed by libreadline-dev + +Fix this by unsetting the cross-compilation PKG_CONFIG variables at the +top of pkgconfigdeps.sh. The script already sets PKG_CONFIG_PATH +explicitly to the directory containing the .pc file being scanned, so +these external variables are not needed and only cause interference. + +This was not an issue with rpm 4.x because OE-core disabled the +internal dependency generator entirely via: + --define '_use_internal_dependency_generator 0' + --define '__find_provides %{nil}' + --define '__find_requires %{nil}' + +rpm 6 no longer supports disabling the internal dependency generator +for v6 format packages, making pkgconfigdeps.sh active for the first +time in the OE cross-build environment. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Sumanth Gavini <[email protected]> +--- + scripts/pkgconfigdeps.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/scripts/pkgconfigdeps.sh b/scripts/pkgconfigdeps.sh +index 1cab58169..f9a3b7c21 100755 +--- a/scripts/pkgconfigdeps.sh ++++ b/scripts/pkgconfigdeps.sh +@@ -1,5 +1,14 @@ + #!/bin/bash + ++# Clear cross-compilation PKG_CONFIG variables that interfere with querying ++# .pc files directly from the package buildroot. In cross-build environments ++# (e.g., OpenEmbedded/Yocto), these variables point at the target sysroot and ++# cause pkg-config to fail when processing buildroot-relative .pc files. ++unset PKG_CONFIG_SYSROOT_DIR ++unset PKG_CONFIG_LIBDIR ++unset PKG_CONFIG_SYSTEM_INCLUDE_PATH ++unset PKG_CONFIG_SYSTEM_LIBRARY_PATH ++ + pkgconfig=/usr/bin/pkg-config + test -x $pkgconfig || { + cat > /dev/null
meta/recipes-devtools/rpm/rpm_6.0.2.bb +1 -0
@@ -39,6 +39,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-6.0.x;protoco file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ file://0001-tools-elfdeps.cc-Remove-format-module.patch \ file://0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch \ + file://0002-pkgconfigdeps.sh-Unset-cross-compilation-PKG_CONFIG-v.patch \ " PE = "1"
PATCH v18 9/16 libarchive: Add RPM format reader to support rpm 6
In reply to Sumanth Gavini* Added 0004-Convert-RPM-reader-into-a-proper-format.patch to convert the RPM reader into a proper format handler. This is needed because RPM 6 changed its internal payload structure and the existing RPM filter (which only strips headers and passes payload through) can no longer parse RPM 6 packages.
Without this patch, debuginfod (elfutils) cannot scan RPM 6 packages:
libarchive error: cannot open archive from pipe: Unrecognized archive format
The existing RPM filter is kept unchanged for API compatibility. The new format reader coexists with it - debuginfod and other tools that use archive_read_support_format_all() will use the format reader for RPM 6 packages.
Fixed:
$ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native
$ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_qemu
$ bitbake core-image-ptest-libarchive:do_testimage (libarchive_test
PASS)The patch is from:[https://github.com/libarchive/libarchive/pull/2846]
--- ...vert-RPM-reader-into-a-proper-format.patch | 1400 +++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 1 + 2 files changed, 1401 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch
meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch new file +1400 -0
@@ -0,0 +1,1400 @@ +From 2606336bce3a7f66cc6c8af28687a82536c9086c Mon Sep 17 00:00:00 2001 +From: Davide Beatrici <[email protected]> +Date: Sun, 9 Aug 2026 14:14:59 -0700 +Subject: [PATCH] libarchive: Convert RPM reader into a proper format + +This adds a new RPM format reader that can handle RPM 6 packages +with their new internal structure. The existing RPM filter is kept +unchanged for API compatibility. + +Without this patch, debuginfod cannot scan RPM 6 packages: + libarchive error: cannot open archive from pipe: Unrecognized + archive format + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846] + +Signed-off-by: Sumanth Gavini <[email protected]> +--- + Makefile.am | 1 + + contrib/android/Android.mk | 1 + + libarchive/CMakeLists.txt | 1 + + libarchive/archive.h | 6 + + libarchive/archive_read.c | 9 +- + libarchive/archive_read_private.h | 2 +- + libarchive/archive_read_set_format.c | 3 + + libarchive/archive_read_support_filter_all.c | 2 + + .../archive_read_support_filter_by_code.c | 2 + + libarchive/archive_read_support_format_all.c | 1 + + libarchive/archive_read_support_format_rpm.c | 1126 +++++++++++++++++ + libarchive/test/test_archive_read_support.c | 2 +- + .../test_read_format_cpio_svr4_bzip2_rpm.c | 4 +- + .../test_read_format_cpio_svr4_gzip_rpm.c | 4 +- + 14 files changed, 1162 insertions(+), 15 deletions(-) + create mode 100644 libarchive/archive_read_support_format_rpm.c + +diff --git a/Makefile.am b/Makefile.am +index c96b3bc..725e20c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -210,6 +210,7 @@ libarchive_la_SOURCES= \ + libarchive/archive_read_support_format_rar.c \ + libarchive/archive_read_support_format_rar5.c \ + libarchive/archive_read_support_format_raw.c \ ++ libarchive/archive_read_support_format_rpm.c \ + libarchive/archive_read_support_format_tar.c \ + libarchive/archive_read_support_format_warc.c \ + libarchive/archive_read_support_format_xar.c \ +diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk +index 9e1c72f..3d1f087 100644 +--- a/contrib/android/Android.mk ++++ b/contrib/android/Android.mk +@@ -91,6 +91,7 @@ libarchive_src_files := libarchive/archive_acl.c \ + libarchive/archive_read_support_format_rar.c \ + libarchive/archive_read_support_format_rar5.c \ + libarchive/archive_read_support_format_raw.c \ ++ libarchive/archive_read_support_format_rpm.c \ + libarchive/archive_read_support_format_tar.c \ + libarchive/archive_read_support_format_warc.c \ + libarchive/archive_read_support_format_xar.c \ +diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt +index b296637..d132123 100644 +--- a/libarchive/CMakeLists.txt ++++ b/libarchive/CMakeLists.txt +@@ -110,6 +110,7 @@ SET(libarchive_SOURCES + archive_read_support_format_rar.c + archive_read_support_format_rar5.c + archive_read_support_format_raw.c ++ archive_read_support_format_rpm.c + archive_read_support_format_tar.c + archive_read_support_format_warc.c + archive_read_support_format_xar.c +diff --git a/libarchive/archive.h b/libarchive/archive.h +index a7de6f6..89c60b3 100644 +--- a/libarchive/archive.h ++++ b/libarchive/archive.h +@@ -314,7 +314,9 @@ typedef const char *archive_passphrase_callback(struct archive *, + #define ARCHIVE_FILTER_LZMA 5 + #define ARCHIVE_FILTER_XZ 6 + #define ARCHIVE_FILTER_UU 7 ++#if ARCHIVE_VERSION_NUMBER < 4000000 + #define ARCHIVE_FILTER_RPM 8 ++#endif + #define ARCHIVE_FILTER_LZIP 9 + #define ARCHIVE_FILTER_LRZIP 10 + #define ARCHIVE_FILTER_LZOP 11 +@@ -385,6 +387,7 @@ typedef const char *archive_passphrase_callback(struct archive *, + #define ARCHIVE_FORMAT_7ZIP 0xE0000 + #define ARCHIVE_FORMAT_WARC 0xF0000 + #define ARCHIVE_FORMAT_RAR_V5 0x100000 ++#define ARCHIVE_FORMAT_RPM 0x110000 + + /* + * Codes returned by archive_read_format_capabilities(). +@@ -478,7 +481,9 @@ __LA_DECL int archive_read_support_filter_program(struct archive *, + __LA_DECL int archive_read_support_filter_program_signature + (struct archive *, const char * /* cmd */, + const void * /* match */, size_t); ++#if ARCHIVE_VERSION_NUMBER < 4000000 + __LA_DECL int archive_read_support_filter_rpm(struct archive *); ++#endif + __LA_DECL int archive_read_support_filter_uu(struct archive *); + __LA_DECL int archive_read_support_filter_xz(struct archive *); + __LA_DECL int archive_read_support_filter_zstd(struct archive *); +@@ -499,6 +504,7 @@ __LA_DECL int archive_read_support_format_mtree(struct archive *); + __LA_DECL int archive_read_support_format_rar(struct archive *); + __LA_DECL int archive_read_support_format_rar5(struct archive *); + __LA_DECL int archive_read_support_format_raw(struct archive *); ++__LA_DECL int archive_read_support_format_rpm(struct archive *); + __LA_DECL int archive_read_support_format_tar(struct archive *); + __LA_DECL int archive_read_support_format_warc(struct archive *); + __LA_DECL int archive_read_support_format_xar(struct archive *); +diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c +index 406d84d..150bd31 100644 +--- a/libarchive/archive_read.c ++++ b/libarchive/archive_read.c +@@ -1296,13 +1296,18 @@ __archive_read_register_bidder(struct archive_read *a, + int i, number_slots; + + archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC, +- ARCHIVE_STATE_NEW, "__archive_read_register_bidder"); ++ ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER, ++ "__archive_read_register_bidder"); + + number_slots = sizeof(a->bidders) / sizeof(a->bidders[0]); + + for (i = 0; i < number_slots; i++) { +- if (a->bidders[i].vtable != NULL) ++ if (a->bidders[i].vtable != NULL) { ++ if (a->bidders[i].vtable == vtable) ++ /* Already registered. */ ++ return (ARCHIVE_OK); + continue; ++ } + memset(a->bidders + i, 0, sizeof(a->bidders[0])); + bidder = (a->bidders + i); + bidder->data = bidder_data; +diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h +index e30b6c2..9ff3602 100644 +--- a/libarchive/archive_read_private.h ++++ b/libarchive/archive_read_private.h +@@ -212,7 +212,7 @@ struct archive_read { + int (*cleanup)(struct archive_read *); + int (*format_capabilties)(struct archive_read *); + int (*has_encrypted_entries)(struct archive_read *); +- } formats[16]; ++ } formats[18]; + struct archive_format_descriptor *format; /* Active format. */ + + /* +diff --git a/libarchive/archive_read_set_format.c b/libarchive/archive_read_set_format.c +index 552ab12..6a176e3 100644 +--- a/libarchive/archive_read_set_format.c ++++ b/libarchive/archive_read_set_format.c +@@ -81,6 +81,9 @@ archive_read_set_format(struct archive *_a, int code) + case ARCHIVE_FORMAT_RAW: + str = "raw"; + break; ++ case ARCHIVE_FORMAT_RPM: ++ str = "rpm"; ++ break; + case ARCHIVE_FORMAT_TAR: + str = "tar"; + break; +diff --git a/libarchive/archive_read_support_filter_all.c b/libarchive/archive_read_support_filter_all.c +index f086773..cc5c2b2 100644 +--- a/libarchive/archive_read_support_filter_all.c ++++ b/libarchive/archive_read_support_filter_all.c +@@ -60,8 +60,10 @@ archive_read_support_filter_all(struct archive *a) + archive_read_support_filter_xz(a); + /* The decode code doesn't use an outside library. */ + archive_read_support_filter_uu(a); ++#if ARCHIVE_VERSION_NUMBER < 4000000 + /* The decode code doesn't use an outside library. */ + archive_read_support_filter_rpm(a); ++#endif + /* The decode code always uses "lrzip -d -q" command-line. */ + archive_read_support_filter_lrzip(a); + /* Lzop decompress falls back to "lzop -d" command-line. */ +diff --git a/libarchive/archive_read_support_filter_by_code.c b/libarchive/archive_read_support_filter_by_code.c +index 4c8b6cb..d3c7d21 100644 +--- a/libarchive/archive_read_support_filter_by_code.c ++++ b/libarchive/archive_read_support_filter_by_code.c +@@ -49,8 +49,10 @@ archive_read_support_filter_by_code(struct archive *a, int filter_code) + return archive_read_support_filter_xz(a); + case ARCHIVE_FILTER_UU: + return archive_read_support_filter_uu(a); ++#if ARCHIVE_VERSION_NUMBER < 4000000 + case ARCHIVE_FILTER_RPM: + return archive_read_support_filter_rpm(a); ++#endif + case ARCHIVE_FILTER_LZIP: + return archive_read_support_filter_lzip(a); + case ARCHIVE_FILTER_LRZIP: +diff --git a/libarchive/archive_read_support_format_all.c b/libarchive/archive_read_support_format_all.c +index a2c5a4c..729b4c4 100644 +--- a/libarchive/archive_read_support_format_all.c ++++ b/libarchive/archive_read_support_format_all.c +@@ -58,6 +58,7 @@ archive_read_support_format_all(struct archive *a) + archive_read_support_format_empty(a); + archive_read_support_format_lha(a); + archive_read_support_format_mtree(a); ++ archive_read_support_format_rpm(a); + archive_read_support_format_tar(a); + archive_read_support_format_xar(a); + archive_read_support_format_warc(a); +diff --git a/libarchive/archive_read_support_format_rpm.c b/libarchive/archive_read_support_format_rpm.c +new file mode 100644 +index 0000000..fe0e500 +--- /dev/null ++++ b/libarchive/archive_read_support_format_rpm.c +@@ -0,0 +1,1126 @@ ++/*- ++ * Copyright (c) 2026 Davide Beatrici ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include "archive_platform.h" ++ ++#ifdef HAVE_ERRNO_H ++#include <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));
meta/recipes-extended/libarchive/libarchive_3.8.9.bb +1 -0
@@ -35,6 +35,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://0001-test-skip-ppmd8-aes256-streaming-test-when-no-crypto.patch \ file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ file://0003-Remove-bidder-name.patch \ + file://0004-Convert-RPM-reader-into-a-proper-format.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
PATCH v18 10/16 pkgconf: add /usr/bin/pkg-config to RPROVIDES
In reply to Sumanth GaviniRPM 6's fileattr script generator produces Requires: /usr/bin/pkg-config for packages that call pkg-config in their scriptlets. Add /usr/bin/pkg-config as an explicit RPROVIDES in pkgconf so these file-path dependencies resolve correctly.
Remove /usr/bin/pkg-config from nativesdk-sdk-provides-dummy.bb since pkgconf now provides it explicitly via RPROVIDES.
--- meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 1 - meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +0 -1
@@ -11,7 +11,6 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ - /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \ "
meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb +1 -1
@@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org" BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" -RPROVIDES:${PN} += "pkgconfig" +RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name.
Re: [OE-core] [PATCH v18 10/16] pkgconf: add /usr/bin/pkg-config to RPROVIDES
Quoted 35 lines · Sumanth Gavini via lists.openembedded.org
RPM 6's fileattr script generator produces Requires:
/usr/bin/pkg-configfor packages that call pkg-config in their scriptlets. Add/usr/bin/pkg-configas an explicit RPROVIDES in pkgconf so these file-path dependencies resolve correctly.
Remove/usr/bin/pkg-configfrom nativesdk-sdk-provides-dummy.bb since pkgconf now provides it explicitly via RPROVIDES.Signed-off-by Sumanth Gavini <[email protected]>---
meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 1 - meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +-2 files changed, 1 insertion(+), 2 deletions(-)meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +0
-1@@ -11,7 +11,6 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ - /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \"
meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb +0
-0@@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org"BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel"
PROVIDES += "pkgconfig"meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb +1
-1-RPROVIDES:${PN} += "pkgconfig" +RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config"
Quoted 4 lines
# The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name.
This reverts half of patch 5 in the series. Do we still need patch 5 at all?
Do we need the RPROVIDES of /usr/bin/pkg-config if we have the pkg- config dependency code in rpm disabled (e.g as in patch 16)?
Cheers,
Richard
Re: [OE-core] [PATCH v18 10/16] pkgconf: add /usr/bin/pkg-config to RPROVIDES
Quoted 46 lines · Richard Purdie
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.Quoted 31 lines · Sumanth Gavini via lists.openembedded.org
RPM 6's fileattr script generator produces Requires:
/usr/bin/pkg-configfor packages that call pkg-config in their scriptlets. Add/usr/bin/pkg-configas an explicit RPROVIDES in pkgconf so these file-path dependencies resolve correctly.
Remove/usr/bin/pkg-configfrom nativesdk-sdk-provides-dummy.bb since pkgconf now provides it explicitly via RPROVIDES.Signed-off-by Sumanth Gavini <[email protected]>--- meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 1 - meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +0
-1@@ -11,7 +11,6 @@ DUMMYPROVIDES = "\ /bin/sh \ /bin/bash \ /usr/bin/env \ - /usr/bin/pkg-config \ libGL.so()(64bit) \ libGL.so \ "meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb +0
-0meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb HOMEPAGE = "http://pkgconf.org" · line 13
Quoted 8 lines
meta/recipes-devtools/pkgconf/pkgconf_3.0.6.bb +1
-1@@ -7,7 +7,7 @@ HOMEPAGE = "http://pkgconf.org" BUGTRACKER = "https://github.com/pkgconf/pkgconf/issues" SECTION = "devel" PROVIDES += "pkgconfig" -RPROVIDES:${PN} += "pkgconfig" +RPROVIDES:${PN} += "pkgconfig /usr/bin/pkg-config" # The pkgconf license seems to be functionally equivalent to BSD-2-Clause or # ISC, but has different wording, so needs its own name.This reverts half of patch 5 in the series. Do we still need patch 5 at all?
Quoted 6 lines
Do we need the RPROVIDES of
/usr/bin/pkg-configif we have the pkg- config dependency code in rpm disabled (e.g as in patch 16)?Cheers,
Richard
Hi Richard,
You're right on both points. With patch 16's __requires_exclude in place, nothing emits Requires: /usr/bin/pkg-config or pkgconfig(...) anymore, so patches 5 and 10 should be redundant.
I'd like to confirm this properly first, I'll run the oe-selftest cases (oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native) without patches 5 and 10 and report back, then send v19 accordingly.
Signature · 2 lines
# Sumanth Gavini # Wind River Linux
PATCH v18 11/16 libarchive: Disable RPM filter auto-bidding and update huge_rpm test
In reply to Sumanth Gavini * Add 0005-Disable-RPM-filter-auto-bidding.patch:
- RPM is now handled by the format reader. Disable the filter's automatic bidding (return 0) so it never intercepts RPM files during normal archive opening. The filter remains functional when explicitly requested via archive_read_append_filter(ARCHIVE_FILTER_RPM).
This ensures debuginfod and other tools that use archive_read_support_format_all() will use the new RPM format reader for RPM 6 packages, while maintaining API compatibility.
* Update 0004-Convert-RPM-reader-into-a-proper-format.patch:
- Include the test_read_format_huge_rpm.c changes from upstream PR #2846. With the filter no longer auto-bidding, the format reader handles the truncated test RPM: opens successfully (ARCHIVE_OK), returns ARCHIVE_EOF on next_header, and identifies the format as ARCHIVE_FORMAT_RPM.
--- ...vert-RPM-reader-into-a-proper-format.patch | 42 ++++++++++- ...0005-Disable-RPM-filter-auto-bidding.patch | 73 +++++++++++++++++++ .../libarchive/libarchive_3.8.9.bb | 1 + 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch
meta/recipes-extended/libarchive/libarchive/0004-Convert-RPM-reader-into-a-proper-format.patch +41 -1
@@ -11,6 +11,14 @@ Without this patch, debuginfod cannot scan RPM 6 packages: libarchive error: cannot open archive from pipe: Unrecognized archive format +The test_read_format_huge_rpm test is updated from upstream PR #2846 +to match the format reader behavior: the format reader opens the +truncated RPM successfully (ARCHIVE_OK), returns ARCHIVE_EOF on +next_header (no valid entries in the crafted file), and correctly +identifies the format as ARCHIVE_FORMAT_RPM. This test requires the +companion 0005 patch (which disables the filter's auto-bidding) so +that the format reader handles the file instead of the filter. + Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846] Signed-off-by: Sumanth Gavini <[email protected]>
@@ -29,7 +37,8 @@ Signed-off-by: Sumanth Gavini <[email protected]> libarchive/test/test_archive_read_support.c | 2 +- .../test_read_format_cpio_svr4_bzip2_rpm.c | 4 +- .../test_read_format_cpio_svr4_gzip_rpm.c | 4 +- - 14 files changed, 1162 insertions(+), 15 deletions(-) + libarchive/test/test_read_format_huge_rpm.c | 13 +- + 15 files changed, 1169 insertions(+), 20 deletions(-) create mode 100644 libarchive/archive_read_support_format_rpm.c diff --git a/Makefile.am b/Makefile.am
@@ -1398,3 +1407,34 @@ index 6062c48..11dbbb4 100644 assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +diff --git a/libarchive/test/test_read_format_huge_rpm.c b/libarchive/test/test_read_format_huge_rpm.c +index 51208c7..10c7fb7 100644 +--- a/libarchive/test/test_read_format_huge_rpm.c ++++ b/libarchive/test/test_read_format_huge_rpm.c +@@ -26,6 +26,7 @@ + + DEFINE_TEST(test_read_format_huge_rpm) + { ++ struct archive_entry *ae; + struct archive *a; + const char *name = "test_read_format_huge_rpm.rpm"; + +@@ -33,11 +34,13 @@ DEFINE_TEST(test_read_format_huge_rpm) + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + extract_reference_file(name); +- /* This archive is truncated -- if it has data, the bid has screwed up */ +- assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_filename(a, name, 2)); +- assertEqualStringA(a, "Truncated input file " +- "(needed 34359738384 bytes, only 10256 available)", +- archive_error_string(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 2)); ++ ++ /* This archive should have no entries -- if it has entries, the bid has screwed up */ ++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); ++ ++ /* Verify that the format detection worked. */ ++ assertEqualInt(ARCHIVE_FORMAT_RPM, archive_format(a)); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a));
meta/recipes-extended/libarchive/libarchive/0005-Disable-RPM-filter-auto-bidding.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive_3.8.9.bb +1 -0
@@ -36,6 +36,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://0001-append_filter-Verify-that-bidder-and-filter-match.patch \ file://0003-Remove-bidder-name.patch \ file://0004-Convert-RPM-reader-into-a-proper-format.patch \ + file://0005-Disable-RPM-filter-auto-bidding.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
PATCH v18 12/16 package_rpm.bbclass: Suppress pkgconfig() Requires for sstate compatibility
In reply to Sumanth Gavinirpm 4 had two dependency generation systems: an external generator (System 1) and an internal fileattr-based generator (System 2). OE used System 1 and disabled everything via:
--define '_use_internal_dependency_generator 0'
--define '__find_requires %{nil}'
--define '__find_provides %{nil}'
This meant pkgconfigdeps.sh (part of System 2) never ran in OE builds.
rpm 6 removed System 1 entirely. For v6-format packages it only runs the fileattr system (System 2), and _use_internal_dependency_generator is ignored. So __find_requires %{nil} no longer works, and pkgconfigdeps.sh now runs for the first time in OE builds.
pkgconfigdeps.sh --requires generates both "Requires:/usr/bin/pkg-config" and "Requires: pkgconfig(foo)" for each .pc dependency. This creates a sstate compatibility problem: packages built before the pkgconfigdeps.sh fix (which unsets PKG_CONFIG_SYSROOT_DIR) have no "Provides:pkgconfig(foo)" because pkg-config was failing silently. When DNF installs a mix of old sstate packages (no Provides) and new packages (now generating Requires),
it fails with:
nothing provides pkgconfig(zlib) needed by elfutils-dev nothing provides pkgconfig(x11) needed by libdrm-dev
In rpm 6, the correct way to suppress a specific fileattr generator is via its per-generator macro. Set __pkgconfig_requires %{nil} so new packages don't generate Requires that old sstate packages can't satisfy. Provides generation (__pkgconfig_provides) is kept so packages still advertise their pkgconfig modules.
OE manages build and runtime deps via DEPENDS/RDEPENDS; auto-generated pkgconfig() Requires from rpmbuild are not needed. This follows the same pattern as the existing __font_provides %{nil}.
--- meta/classes-global/package_rpm.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes-global/package_rpm.bbclass +1 -0
@@ -599,6 +599,7 @@ python do_package_rpm () { cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'" cmd = cmd + " --define '__font_provides %{nil}'" + cmd = cmd + " --define '__pkgconfig_requires %{nil}'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'"
PATCH v18 13/16 lib/oe/package_manager/rpm: Enable DNF filelists to resolve file deps
In reply to Sumanth GaviniWith rpm 6's internal dependency generator now active in OE builds, pkgconfigdeps.sh --requires always emits "Requires: /usr/bin/pkg-config" for any package that ships .pc files. This line is emitted before pkg-config is even called, so packages built during the early rpm 6 migration (before the PKG_CONFIG_SYSROOT_DIR fix) carry this requirement even though they have no pkgconfig() Provides.
DNF only reads primary.xml by default, which holds explicit Provides declarations. pkgconf now has RPROVIDES += "/usr/bin/pkg-config", but pkgconf packages fetched from the hash-equivalence sstate server were built before that change and have no explicit Provides in primary.xml.
createrepo_c already generates filelists.xml by default. Enabling optional_metadata_types=filelists tells DNF to also load it, so DNF can match "Requires: /usr/bin/pkg-config" against pkgconf's actual installed file list regardless of when pkgconf was built. This covers the sstate transition period without requiring a full rebuild of pkgconf.
--- meta/lib/oe/package_manager/rpm/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oe/package_manager/rpm/__init__.py +2 -1
@@ -318,7 +318,8 @@ class RpmPM(PackageManager): "-c", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), "--setopt=reposdir=%s" %(oe.path.join(self.target_rootfs, "etc/yum.repos.d")), "--installroot=%s" % (self.target_rootfs), - "--setopt=logdir=%s" % (self.d.getVar('T')) + "--setopt=logdir=%s" % (self.d.getVar('T')), + "--setopt=optional_metadata_types=filelists", ] if hasattr(self, "rpm_repo_dir"): standard_dnf_args.append("--repofrompath=oe-repo,%s" % (self.rpm_repo_dir))
PATCH v18 14/16 package_rpm.bbclass: suppress RPM 6 fileattr dependency generators
In reply to Sumanth GaviniRPM 6 replaced the monolithic __find_requires/__find_provides scripts (RPM 4) with per-filetype fileattr dependency generators. Each file type now has its own macro pair:
__elf_requires / __elf_provides (ELF binaries) __script_requires (shell scripts) __pkgconfig_provides (pkg-config .pc files) __desktop_provides (freedesktop .desktop files) __debuginfo_provides (debuginfo packages) __metainfo_provides (AppStream metainfo) __ocaml_requires / __ocaml_provides (OCaml modules) __rpm_lua_provides (Lua RPM macros) __rpm_macro_provides (RPM macro files) __usergroup_provides (user/group entries)
None of these are appropriate for cross-compiled embedded packages:
- ELF deps are target-arch specific and would resolve against wrong sysroot libraries
- pkg-config, OCaml, Lua and macro provides are host tooling concepts not applicable in an embedded rootfs
- OE already handles its own dependency tracking via perfiledeps scripts
Suppress all of them with %{nil} to restore the RPM 4 behaviour where OE's perfiledeps scripts have full control over what gets generated.
--- meta/classes-global/package_rpm.bbclass | 12 ++++++++++++ 1 file changed, 12 insertions(+)
meta/classes-global/package_rpm.bbclass +12 -0
@@ -600,6 +600,18 @@ python do_package_rpm () { cmd = cmd + " --define '_buildhost reproducible'" cmd = cmd + " --define '__font_provides %{nil}'" cmd = cmd + " --define '__pkgconfig_requires %{nil}'" + cmd = cmd + " --define '__elf_requires %{nil}'" + cmd = cmd + " --define '__elf_provides %{nil}'" + cmd = cmd + " --define '__script_requires %{nil}'" + cmd = cmd + " --define '__pkgconfig_provides %{nil}'" + cmd = cmd + " --define '__desktop_provides %{nil}'" + cmd = cmd + " --define '__debuginfo_provides %{nil}'" + cmd = cmd + " --define '__metainfo_provides %{nil}'" + cmd = cmd + " --define '__ocaml_requires %{nil}'" + cmd = cmd + " --define '__ocaml_provides %{nil}'" + cmd = cmd + " --define '__rpm_lua_provides %{nil}'" + cmd = cmd + " --define '__rpm_macro_provides %{nil}'" + cmd = cmd + " --define '__usergroup_provides %{nil}'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'"
PATCH v18 15/16 lib/oe/package_manager/rpm: handle RPM 6 non-zero exit on %post failure
In reply to Sumanth GaviniRPM 6.0 intentionally changed rpmtsRun() to return -1 whenever any scriptlet fails, even non-critical ones like %post where warn_only=True (upstream RPM PR#3819, lib/transaction.cc).
Root cause - two changes in RPM 6 lib/transaction.cc vs RPM 4:
1. New field set before warn_only resets rc (transaction.cc:1754):
ts->scriptError = 1;
2. Final exit now ORs in the new flag (transaction.cc:1910):
RPM 4: rc = nfailed ? -1 : 0;
RPM 6: rc = (nfailed || ts->scriptError) ? -1 : 0;Call chain for a failing %post in RPM 4 (exits 0):
runScript() warn_only=1 -> rc reset to RPMRC_OK psm.c:896 if (rc) break -> NOT taken, install continues rpmte.c:823 if (failed) -> NOT taken, rpmteMarkFailed() skipped
transaction.c:1652 if (failed) -> NOT taken, nfailed stays 0 transaction.c:1896 rc = nfailed ? -1 : 0 -> rc=0
Python ts.run() returns None -> DNF exits 0
Call chain for a failing %post in RPM 6 (exits 1):
runScript() ts->scriptError=1, then rc reset to RPMRC_OK psm.c:896 if (rc) break -> NOT taken (rc still 0) rpmte.c:823 if (failed) -> NOT taken (same as RPM 4)
transaction.cc:1652 if (failed) -> NOT taken, nfailed stays 0 transaction.cc:1910 rc = (nfailed || ts->scriptError) ? -1 : 0 -> rc=-1
Python ts.run() returns [] -> DNF raises "Could not run
transaction."
-> DNF exits 1
In both RPM versions, RPMCALLBACK_SCRIPT_ERROR fires and DNF's _scriptError() (dnf/yum/rpmtrans.py:407-418) prints:
"Error in POSTIN scriptlet in rpm package <name>"
OE's install_pkgs() already scans for this line and calls failed_postinsts_abort() (package_manager/rpm/__init__.py:210-219). With RPM 4 this path is always reached because DNF exits 0. With RPM 6 the CalledProcessError raised by DNF's non-zero exit intercepts execution
in _invoke_dnf() before the scan runs.
DNF 4 (lib/dnf/base.py:1146-1158) was never updated for this RPM 6 behaviour. When ts.run() returns [] with no failed elements it unconditionally raises "Could not run transaction." - the comment at base.py:1147 still describes RPM 4 semantics where this case meant a global error such as a transaction lock failure. There is an open DNF5 issue (#2507) but no fix in DNF 4.
Fix: detect "Error in POSTIN scriptlet in rpm package" in the DNF output inside _invoke_dnf()'s CalledProcessError handler and return the output instead of calling bb.fatal(), allowing install_pkgs()'s existing scriptlet scan to run as it did with RPM 4.
Tested with oe-selftest runtime_test.Postinst.test_failing_postinst:
rpm 4.20.x: PASSED - DNF exits 0, scan path exercised as expected rpm 6.0.x without fix: FAILED - CalledProcessError before scan reached rpm 6.0.x with fix: PASSED - scan path restored, bb.fatal() fires
References:
https://github.com/rpm-software-management/rpm/pull/3819
--- meta/lib/oe/package_manager/rpm/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+)
meta/lib/oe/package_manager/rpm/__init__.py +7 -0
@@ -333,6 +333,13 @@ class RpmPM(PackageManager): except subprocess.CalledProcessError as e: if print_output: e_output = e.output.decode("utf-8") + # RPM 6 fails the entire transaction when a %post scriptlet + # fails, causing dnf to exit non-zero. Let install_pkgs handle + # scriptlet failures via its existing "Error in POSTIN scriptlet" + # scanning rather than treating this as a fatal dnf invocation error. + if "Error in POSTIN scriptlet in rpm package" in e_output: + bb.note(e_output) + return e_output extra_info = "" if "install" in dnf_args: if "Error: Unable to find a match:" in e_output:
PATCH v18 16/16 package_rpm.bbclass: filter pkgconfig() deps regardless of generator state
In reply to Sumanth Gavini__pkgconfig_provides/__pkgconfig_requires %{nil} don't reliably suppress RPM 6's pkgconfig fileattr generator - confirmed via a cleansstate rebuild of hicolor-icon-theme still showing "pkgconfig(default-icon-theme)" and "/usr/bin/pkg-config" in the built package despite these defines. Most likely because rpm's own fileattrs/pkgconfig.attr re-defines the same macros later in the dependency-generation phase, after our --define has already run, clobbering our override.
Add __requires_exclude/__provides_exclude on top of the existing defines, as a final safety net: these filter the finished Requires/Provides list in rpm's core dependency code rather than the overridable fileattr scripts, so they take effect regardless of whether the generator suppression above was actually honored.
--- meta/classes-global/package_rpm.bbclass | 2 ++ 1 file changed, 2 insertions(+)
meta/classes-global/package_rpm.bbclass +2 -0
@@ -612,6 +612,8 @@ python do_package_rpm () { cmd = cmd + " --define '__rpm_lua_provides %{nil}'" cmd = cmd + " --define '__rpm_macro_provides %{nil}'" cmd = cmd + " --define '__usergroup_provides %{nil}'" + cmd = cmd + " --define '__requires_exclude ^pkgconfig\\(.*\\)$|^/usr/bin/pkg-config$'" + cmd = cmd + " --define '__provides_exclude ^pkgconfig\\(.*\\)$'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'"
Quoted 12 lines · Sumanth Gavini
* V18:
- patch 01-09: unchanged from v17.
- patch 10: split into two patches based on richard comments.
- patch 11-14: no code changes; patch numbering updated to 12-15.
- Added "package_rpm.bbclass: filterpkgconfig()deps regardless of generator state" (0016 patch). Fixes the reproducibility failure Mathieu reported on v17 (pkgconfig()Provides/Requires differing between reproducibleA/reproducibleB-extended on hicolor-icon-theme-dev and others). __pkgconfig_provides/__pkgconfig_requires %{nil} don't reliably suppress RPM 6's generator; adds __requires_exclude/__provides_exclude as an unconditional filter.
Hi Sumanth,
Thanks for the new version.
We still have a reproducibility issue, I believe it's the same as for the previous version:
2026-08-27 09:37:58,061 - oe-selftest - INFO - Traceback (most recent call last):
File "/srv/pokybuild/yocto-worker/reproducible/build/layers/openembedded-core/meta/lib/oeqa/selftest/cases/reproducible.py", line 407, in test_reproducible_builds
self.fail('\n'.join(fails))
~~~~~~~~~^^^^^^^^^^^^^^^^^^AssertionError: The following rpm packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./noarch/hicolor-icon-theme-dev-0.18-r0.noarch.rpm /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./noarch/iso-codes-dev-4.20.1-r0.noarch.rpm /srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./noarch/wayland-protocols-dev-1.49-r0.noarch.rpm
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/4828
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260827-qol4ae7a/packages/diff-html/
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 36 lines · Mathieu Dubois-Briand
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.Quoted 12 lines · Sumanth Gavini
* V18:
- patch 01-09: unchanged from v17.
- patch 10: split into two patches based on richard comments.
- patch 11-14: no code changes; patch numbering updated to 12-15.
- Added "package_rpm.bbclass: filterpkgconfig()deps regardless of generator state" (0016 patch). Fixes the reproducibility failure Mathieu reported on v17 (pkgconfig()Provides/Requires differing between reproducibleA/reproducibleB-extended on hicolor-icon-theme-dev and others). __pkgconfig_provides/__pkgconfig_requires %{nil} don't reliably suppress RPM 6's generator; adds __requires_exclude/__provides_exclude as an unconditional filter.Hi Sumanth,
Thanks for the new version.
We still have a reproducibility issue, I believe it's the same as for the previous version:
2026-08-27 09:37:58,061 - oe-selftest - INFO - Traceback (most recent call last): File "/srv/pokybuild/yocto-worker/reproducible/build/layers/openembedded-core/meta/lib/oeqa/selftest/cases/reproducible.py", line 407, in test_reproducible_builds self.fail('\n'.join(fails)) ~~~~~~~~~^^^^^^^^^^^^^^^^^^AssertionError: The following rpm packages are different and not in exclusion list:
/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./noarch/hicolor-icon-theme-dev-0.18-r0.noarch.rpm/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./noarch/iso-codes-dev-4.20.1-r0.noarch.rpm/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./noarch/wayland-protocols-dev-1.49-r0.noarch.rpmhttps://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/4828
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260827-qol4ae7a/packages/diff-html/
Quoted 8 lines
Thanks,
Mathieu--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Hi Richard and Mathieu,
Update on the pkgconfig issue.
I dropped the five workaround patches (DUMMYPROVIDES, cross-build Provides fix, pkgconf RPROVIDES, sstate-compat suppress, __requires_exclude) and replaced them with one: disable RPM 6's pkgconfig fileattr generator by removing pkgconfig.attr and pkgconfigdeps.sh from rpm's install lists via a source patch. The __pkgconfig_* macro overrides aren't reliably honoured, so removing the generator is the only thing that works.
Status:
Local (oe-selftest -r reproducible): passes every time. No pkgconfig() / /usr/bin/pkg-config deps in the -dev packages; populate_sdk works without the dummy patch.
Autobuilder: still fails ~1 in 3 runs, always the same packages (hicolor-icon-theme-dev, iso-codes-dev, wayland-protocols-dev). The from-scratch build (reproducibleB) is clean; the sstate build (reproducibleA) still has the pkgconfig deps.
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/4834
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/4837
The sstate build looks like it's pulling a pre-fix rpm/rpm-native from the shared sstate. Will this clear once the autobuilder has rebuilt everything for this branch with the new rpm, or is something in my change letting the stale package get reused? If it's the latter, any pointers on where to look would help.
Updated series on skokkonda/rpm02.
https://git.openembedded.org/openembedded-core-contrib/log/?h=skokkonda/rpm02
Signature · 2 lines
# Sumanth Gavini # Wind River Linux