rpm: 4.20.1 -> 6.0.1
v8 cover rpm: 4.20.1 -> 6.0.1
From: Robert Yang <[email protected]>
* 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
// Robert
The following changes since commit 7e75ec7a66c8c5f06c264784b0b6daaca37a9381:
bitbake.conf: Set PACKAGECONFIG vardepvalue (2026-03-12 12:02:30 +0000)
are available in the Git repository at:
https://github.com/robertlinux/yocto rbt/rpm
https://github.com/robertlinux/yocto/tree/rbt/rpm
for you to fetch changes up to 9ee544efe319d8a002a88c0401da0a2e5ae007a9:
libarchive: Make it work with rpm 6 (2026-03-12 07:00:10 -0700)
----------------------------------------------------------------
Peter Marko (1):
libarchive: upgrade 3.8.5 -> 3.8.6
Robert Yang (8):
package_rpm.bbclass: Drop external dependency generator to support rpm
6
package_rpm.bbclass: Define _lib and _libdir for rpmbuild lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or
musl
glib/python3/acl: Add pkgconfig to RDEPENDS lib/oe/package.py: Don't redirect stderr
target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES
rpm: 4.20.1 -> 6.0.1
libarchive: Make it work with rpm 6
meta/classes-global/package_rpm.bbclass | 90 +-
meta/lib/oe/package.py | 5 +-
meta/recipes-core/glib-2.0/glib.inc | 2 +-
meta/recipes-core/glibc/glibc-package.inc | 5 +
.../meta/nativesdk-sdk-provides-dummy.bb | 1 +
.../meta/target-sdk-provides-dummy.bb | 1 +
meta/recipes-core/musl/musl_git.bb | 5 +
.../recipes-devtools/python/python3_3.14.3.bb | 2 +
...olor-setting-for-mips64_n32-binaries.patch | 21 +-
...akeLists.txt-Fix-checking-for-CFLAGS.patch | 46 -
...et-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch | 50 -
...satisfiable-dependency-when-building.patch | 17 +-
...lib-rpm-as-the-installation-path-for.patch | 23 +-
...1-Do-not-read-config-files-from-HOME.patch | 17 +-
...-PATH-environment-variable-before-ru.patch | 15 +-
...lling-execute-package-scriptlets-wit.patch | 11 +-
...not-insert-payloadflags-into-.rpm-me.patch | 17 +-
....c-fix-file-conflicts-for-MIPS64-N32.patch | 17 +-
...kgverify_level-to-digest-as-RCPM-4.2.patch | 34 +
...nfigdeps.sh-Use-pkg-config-from-PATH.patch | 42 +
...ools-elfdeps.cc-Remove-format-module.patch | 37 +
...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 25 +-
...avoid-using-GLOB_BRACE-if-undefined-.patch | 13 +-
...ge-logging-level-around-scriptlets-t.patch | 13 +-
.../rpm/{rpm_4.20.1.bb => rpm_6.0.1.bb} | 15 +-
...end_filter-Keep-iterating-even-if-na.patch | 48 +
...egister_bidder-Allow-ARCHIVE_STATE_H.patch | 45 +
...er-into-a-proper-format-supporting-b.patch | 1723 +++++++++++++++++
...ibarchive_3.8.5.bb => libarchive_3.8.6.bb} | 5 +-
meta/recipes-support/attr/acl_2.3.2.bb | 2 +
30 files changed, 2074 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-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.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.1.bb} (94%)
create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch
rename meta/recipes-extended/libarchive/{libarchive_3.8.5.bb => libarchive_3.8.6.bb} (90%)Signature · 1 line
2.49.0
PATCH v8 1/9 package_rpm.bbclass: Drop external dependency generator to support rpm 6
From: Robert Yang <[email protected]>
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
@@ -339,7 +274,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():
@@ -393,10 +327,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)
@@ -665,10 +598,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')
@@ -693,7 +622,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'"
@@ -703,12 +631,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 + "'"
Signature · 1 line
2.49.0
PATCH v8 2/9 package_rpm.bbclass: Define _lib and _libdir for rpmbuild
In reply to [email protected]From: Robert Yang <[email protected]>
The rpmbuild is from rpm-native, the lib and _libdir may be incorrect for target, for example:
* rpm 4.20.1:
No pkg-config files can be found for qemux86-64 or qemuarm64
* rpm 6.0.1:
- 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.1.
--- meta/classes-global/package_rpm.bbclass | 2 ++ 1 file changed, 2 insertions(+)
meta/classes-global/package_rpm.bbclass +2 -0
@@ -620,6 +620,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'"
Signature · 1 line
2.49.0
PATCH v8 3/9 lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or musl
In reply to [email protected]From: Robert Yang <[email protected]>
Fixed:
$ bitbake core-image-full-cmdline:do_testimage %post(busybox-1.37.0-r0.x86_64_x32): execv(/bin/sh) pid 624 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 | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-)
meta/lib/oe/package.py +2 -1
@@ -1824,7 +1824,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
@@ -293,6 +293,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 +5 -0
@@ -81,4 +81,9 @@ 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" +
Signature · 1 line
2.49.0
PATCH v8 4/9 glib/python3/acl: Add pkgconfig to RDEPENDS
In reply to [email protected]From: Robert Yang <[email protected]>
Fixed issues like::
Error:
Problem 1: package python3-ptest-3.14.2-r0.cortexa15t2hf_neon from oe-repo requires python3-dev, but none of the providers can be installed
- conflicting requests
- nothing provides /usr/bin/pkg-config needed by python3-dev-3.14.2-r0.cortexa15t2hf_neon from oe-repo
Problem 2: package libglib-2.0-ptest-1:2.86.3-r0.cortexa15t2hf_neon from oe-repo requires glib-2.0-dev, but none of the providers can be installed
- conflicting requests
- nothing provides /usr/bin/pkg-config needed by libglib-2.0-dev-1:2.86.3-r0.cortexa15t2hf_neon from oe-repo
(try to add '--skip-broken' to skip uninstallable packages or '--setopt=optional_metadata_types=filelists' to load additional filelists metadata)
This is because the rpm 6.0.1 can find the pkg-config files (.pc) provides/requires correctly now, the rpm 4.20.1 couldn't find that.
--- meta/recipes-core/glib-2.0/glib.inc | 2 +- meta/recipes-devtools/python/python3_3.14.3.bb | 2 ++ meta/recipes-support/attr/acl_2.3.2.bb | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-)
meta/recipes-core/glib-2.0/glib.inc +1 -1
@@ -159,7 +159,7 @@ CODEGEN_PYTHON_RDEPENDS:mingw32 = "" RDEPENDS:${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" -RDEPENDS:${PN}-dev += "${PN}-utils" +RDEPENDS:${PN}-dev += "${PN}-utils pkgconfig" RDEPENDS:${PN}-ptest += "\ coreutils \
meta/recipes-devtools/python/python3_3.14.3.bb +2 -0
@@ -495,6 +495,8 @@ RDEPENDS:${PN}-pydoc += "${PN}-io" RDEPENDS:${PN}-tests:append:class-target = " ${MLPREFIX}bash" RDEPENDS:${PN}-tests:append:class-nativesdk = " ${MLPREFIX}bash" +RDEPENDS:{PN}-dev += "pkgconfig" + # Python's tests contain large numbers of files we don't need in the recipe sysroots SYSROOT_PREPROCESS_FUNCS += " py3_sysroot_cleanup" py3_sysroot_cleanup () {
meta/recipes-support/attr/acl_2.3.2.bb +2 -0
@@ -67,4 +67,6 @@ RDEPENDS:${PN}-ptest = "acl \ perl-module-posix \ " +RDEPENDS:${PN}-dev = "pkgconfig" + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.49.0
Re: [OE-core] [PATCH v8 4/9] glib/python3/acl: Add pkgconfig to RDEPENDS
Quoted 12 lines · Robert Yang via lists.openembedded.org
From: Robert Yang <[email protected]>
Fixed issues like::
Error:
Problem 1: package python3-ptest-3.14.2-r0.cortexa15t2hf_neon from oe-repo requires python3-dev, but none of the providers can be installed
- conflicting requests
- nothing provides/usr/bin/pkg-configneeded by python3-dev-3.14.2-r0.cortexa15t2hf_neon from oe-repo
Problem 2: package libglib-2.0-ptest-1:2.86.3-r0.cortexa15t2hf_neon from oe-repo requires glib-2.0-dev, but none of the providers can be installed
- conflicting requests
- nothing provides/usr/bin/pkg-configneeded by libglib-2.0-dev-1:2.86.3-r0.cortexa15t2hf_neon from oe-repo
(try to add '--skip-broken' to skip uninstallable packages or '--setopt=optional_metadata_types=filelists' to load additional filelists metadata)
Quoted 4 lines
This is because the rpm 6.0.1 can find the pkg-config files (.pc) provides/requires correctly now, the rpm 4.20.1 couldn't find that.
Signed-off-by Robert Yang <[email protected]>
I'm a bit worried about the pkg-config dependencies. Are we able to turn this off if we need/want to?
The reason why is that installing a -dev package doesn't necessarily mean you actually need/want pkg-config. I appreciate there is a .pc file there, but just because you have a .pc file, it doesn't mean you are going to need/want to use it.
Do you have any comparison of the dependencies before/after the change and are there any other changes we need to be aware of?
Cheers,
Richard
Re: [OE-core] [PATCH v8 4/9] glib/python3/acl: Add pkgconfig to RDEPENDS
Quoted 22 lines · Richard Purdie
Quoted 12 lines · Robert Yang via lists.openembedded.org
From: Robert Yang <[email protected]>
Fixed issues like::
Error:
Problem 1: package python3-ptest-3.14.2-r0.cortexa15t2hf_neon from oe-repo requires python3-dev, but none of the providers can be installed
- conflicting requests
- nothing provides/usr/bin/pkg-configneeded by python3-dev-3.14.2-r0.cortexa15t2hf_neon from oe-repo
Problem 2: package libglib-2.0-ptest-1:2.86.3-r0.cortexa15t2hf_neon from oe-repo requires glib-2.0-dev, but none of the providers can be installed
- conflicting requests
- nothing provides/usr/bin/pkg-configneeded by libglib-2.0-dev-1:2.86.3-r0.cortexa15t2hf_neon from oe-repo
(try to add '--skip-broken' to skip uninstallable packages or '--setopt=optional_metadata_types=filelists' to load additional filelists metadata)Quoted 4 lines
This is because the rpm 6.0.1 can find the pkg-config files (.pc) provides/requires correctly now, the rpm 4.20.1 couldn't find that.
Signed-off-by Robert Yang <[email protected]>I'm a bit worried about the pkg-config dependencies. Are we able to turn this off if we need/want to?
Quoted 7 lines
The reason why is that installing a -dev package doesn't necessarily mean you actually need/want pkg-config. I appreciate there is a .pc file there, but just because you have a .pc file, it doesn't mean you are going to need/want to use it.
Do you have any comparison of the dependencies before/after the change and are there any other changes we need to be aware of?
My other concern is why this is needed for these three recipes and no others…
Ross
PATCH v8 5/9 lib/oe/package.py: Don't redirect stderr
In reply to [email protected]From: Robert Yang <[email protected]>
This 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
@@ -276,7 +276,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)
Signature · 1 line
2.49.0
PATCH v8 6/9 target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES
In reply to [email protected]From: Robert Yang <[email protected]>
The rpm package requires /usr/bin/pkg-config when it has .pc files.
Fixed:
1) target-sdk-provides-dummy.bb:
- package acl-dev-2.3.2-r0.core2_64 from oe-repo requires /usr/bin/pkg-config, but none of the providers can be installed
2) nativesdk-sdk-provides-dummy.bb:
- package nativesdk-wayland-dev-1.24.0-r0.x86_64_nativesdk from oe-repo requires /usr/bin/pkg-config, but none of the providers can be installed
--- 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
@@ -8,6 +8,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
@@ -52,6 +52,7 @@ DUMMYPROVIDES = "\ /bin/bash \ /usr/bin/env \ /usr/bin/perl \ + /usr/bin/pkg-config \ libperl.so.5 \ libperl.so.5()(64bit) \ "
Signature · 1 line
2.49.0
PATCH v8 7/9 rpm: 4.20.1 -> 6.0.1
In reply to [email protected]From: Robert Yang <[email protected]>
* 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.1.
* 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
- 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
* 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 | 21 ++++----
...akeLists.txt-Fix-checking-for-CFLAGS.patch | 46 -----------------
...et-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch | 50 -------------------
...satisfiable-dependency-when-building.patch | 17 ++++---
...lib-rpm-as-the-installation-path-for.patch | 23 +++------
...1-Do-not-read-config-files-from-HOME.patch | 17 ++++---
...-PATH-environment-variable-before-ru.patch | 15 +++---
...lling-execute-package-scriptlets-wit.patch | 11 ++--
...not-insert-payloadflags-into-.rpm-me.patch | 17 ++++---
....c-fix-file-conflicts-for-MIPS64-N32.patch | 17 ++++---
...kgverify_level-to-digest-as-RCPM-4.2.patch | 34 +++++++++++++
...nfigdeps.sh-Use-pkg-config-from-PATH.patch | 42 ++++++++++++++++
...ools-elfdeps.cc-Remove-format-module.patch | 37 ++++++++++++++
...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 25 ++++++----
...avoid-using-GLOB_BRACE-if-undefined-.patch | 13 +++--
...ge-logging-level-around-scriptlets-t.patch | 13 ++---
.../rpm/{rpm_4.20.1.bb => rpm_6.0.1.bb} | 15 +++---
18 files changed, 229 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-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.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.1.bb} (94%)meta/classes-global/package_rpm.bbclass +4 -0
@@ -622,6 +622,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'"
@@ -636,6 +637,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" + "'"
@@ -665,6 +667,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 +12 -9
@@ -5,16 +5,19 @@ 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.1 +Signed-off-by: Robert Yang <[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 +25,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 +36,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 +10 -7
@@ -9,16 +9,19 @@ hand produces rpms that way by design. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + +Rebased to 6.0.1 +Signed-off-by: Robert Yang <[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 +7 -16
@@ -6,10 +6,15 @@ 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.1: +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]> --- 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 +28,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 +10 -7
@@ -5,15 +5,18 @@ 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.1 +Signed-off-by: Robert Yang <[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 +26,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 +9 -6
@@ -8,15 +8,18 @@ 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.1 +Signed-off-by: Robert Yang <[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 +6 -5
@@ -26,15 +26,16 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> Rebased to 4.20.1 +Rebased to 6.0.1 Signed-off-by: Robert Yang <[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 +10 -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,18 @@ 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.1 +Signed-off-by: Robert Yang <[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 +10 -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,18 @@ 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.1 +Signed-off-by: Robert Yang <[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 +34 -0
@@ -0,0 +1,34 @@ +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]> +--- + 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-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-devtools/rpm/files/0001-tools-elfdeps.cc-Remove-format-module.patch new file +37 -0
@@ -0,0 +1,37 @@ +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]> +--- + 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 +14 -11
@@ -9,15 +9,18 @@ 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.1 +Signed-off-by: Robert Yang <[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 +36,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 +49,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 +58,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 +8 -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,17 @@ 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.1 +Signed-off-by: Robert Yang <[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 +7 -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,16 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> Rebased to 4.20.1 +Rebased to 6.0.1 Signed-off-by: Robert Yang <[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.1.bb renamed from meta/recipes-devtools/rpm/rpm_4.20.1.bb +9 -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=${BPN}-6.0.x;tag=${BP}-release;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,15 @@ 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 \ + file://0001-scripts-pkgconfigdeps.sh-Use-pkg-config-from-PATH.patch \ " PE = "1" -SRCREV = "c8dc5ea575a2e9c1488036d12f4b75f6a5a49120" +SRCREV = "58a917a6c5e24e9e8a01976c17d2eee06249b9b6" -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"
@@ -151,7 +152,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 \ "
@@ -178,6 +180,7 @@ FILES:${PN}-build = "\ ${libdir}/rpm/mkinstalldirs \ ${libdir}/rpm/macros.p* \ ${libdir}/rpm/fileattrs/* \ + ${libdir}/rpm/rpm-setup-autosign \ " FILES:${PN}-sign = "\
Signature · 1 line
2.49.0
PATCH v8 8/9 libarchive: upgrade 3.8.5 -> 3.8.6
In reply to [email protected]From: Peter Marko <[email protected]>
Release information [1]:
Libarchive 3.8.6 is a security and bugfix release.
Notable fixes:
* libarchive: fix incompatibility with Nettle 4.x (#2858)
* libarchive: fix NULL pointer dereference in archive_acl_from_text_w() (#2859)
* bsdunzip: fix ISO week year and Gregorian year confusion (#2860)
* 7zip: ix SEGV in check_7zip_header_in_sfx via ELF offset validation (#2864)
* 7zip: fix out-of-bounds access on ELF 64-bit header (#2875)
* RAR5 reader: fix infinite loop in rar5 decompression (#2877)
* RAR5 reader: fix potential memory leak (#2892)
* RAR5: fix SIGSEGV when archive_read_support_format_rar5 is called twice (#2893)
* CAB reader: fix memory leak on repeated calls to archive_read_support_format_cab (#2895)
* mtree reader: Fix file descriptor leak in mtree parser cleanup (CWE-775, #2878)
* various small bugfixes in code and documentation
[1] https://github.com/libarchive/libarchive/releases/tag/v3.8.6
---
.../libarchive/{libarchive_3.8.5.bb => libarchive_3.8.6.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/libarchive/{libarchive_3.8.5.bb => libarchive_3.8.6.bb} (97%)meta/recipes-extended/libarchive/libarchive_3.8.6.bb renamed from meta/recipes-extended/libarchive/libarchive_3.8.5.bb +1 -1
@@ -34,7 +34,7 @@ SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/" -SRC_URI[sha256sum] = "8a60f3a7bfd59c54ce82ae805a93dba65defd04148c3333b7eaa2102f03b7ffd" +SRC_URI[sha256sum] = "213269b05aac957c98f6e944774bb438d0bd168a2ec60b9e4f8d92035925821c" inherit autotools update-alternatives pkgconfig ptest
Signature · 1 line
2.49.0
PATCH v8 9/9 libarchive: Make it work with rpm 6
In reply to [email protected]From: Robert Yang <[email protected]>
The patch is from:
https://github.com/libarchive/libarchive/pull/2846
Fixed:
$ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native
cannot open archive from pipe /path/to/tmp-debuginfod/work/x86-64-v3-poky-linux/xz/5.8.2/localpkgfeed/x86_64_v3/bash-locale-vi-5.3-r0.x86_64_v3.rpm libarchive error: cannot open archive from pipe: Unrecognized archive format
exceptions encountered during archive scan
--- ...end_filter-Keep-iterating-even-if-na.patch | 48 + ...egister_bidder-Allow-ARCHIVE_STATE_H.patch | 45 + ...er-into-a-proper-format-supporting-b.patch | 1723 +++++++++++++++++ .../libarchive/libarchive_3.8.6.bb | 3 + 4 files changed, 1819 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch
meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch new file +48 -0
@@ -0,0 +1,48 @@ +From 26401df2e74e6d72e86fab165445949c9dd3eba9 Mon Sep 17 00:00:00 2001 +From: Davide Beatrici <[email protected]> +Date: Sat, 21 Feb 2026 02:55:40 +0100 +Subject: [PATCH 1/3] archive_read_append_filter(): Keep iterating even if name + is null + +While working on the RPM format I noticed the zstd filter failed to append. + +Turns out there are two unknown filters that are registered with a null name: + +bidder candidate bzip2 +bidder candidate compress (.Z) +bidder candidate gzip +bidder candidate lzip +bidder candidate lzma +bidder candidate xz +bidder candidate uu +bidder candidate lrzip +bidder candidate (null) +bidder candidate (null) +bidder candidate lz4 +bidder candidate zstd + +I'm not sure if anonymous filters are expected behavior, but I believe this change doesn't hurt. + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846] + +Signed-off-by: Robert Yang <[email protected]> +--- + libarchive/archive_read_append_filter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_append_filter.c b/libarchive/archive_read_append_filter.c +index cd88df11..9475b704 100644 +--- a/libarchive/archive_read_append_filter.c ++++ b/libarchive/archive_read_append_filter.c +@@ -117,7 +117,7 @@ archive_read_append_filter(struct archive *_a, int code) + bidder = a->bidders; + for (i = 1; i < number_bidders; i++, bidder++) + { +- if (!bidder->name || !strcmp(bidder->name, str)) ++ if (bidder->name && !strcmp(bidder->name, str)) + break; + } + if (!bidder->name || strcmp(bidder->name, str)) +-- +2.49.0 +
meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch new file +1723 -0
1,723 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive_3.8.6.bb +3 -0
@@ -31,6 +31,9 @@ EXTRA_OECONF += "--enable-largefile --without-iconv" SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://run-ptest \ + file://0001-archive_read_append_filter-Keep-iterating-even-if-na.patch \ + file://0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch \ + file://0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
Signature · 1 line
2.49.0
Quoted 35 lines · liezhi.yang
From: Robert Yang <[email protected]>
* 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/shand 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
Quoted 8 lines
- Drop patch for createrepo-c since it has been upgraded (rev:
804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)* V1 & V2
- Initial version// Robert
Hi Robert,
Thanks for the new version.
I suspect I still need to get some gettext patch with it. Either yours or the one from the glibc upgrade series. Is that right?
https://lore.kernel.org/openembedded-core/[email protected]/
https://lore.kernel.org/openembedded-core/[email protected]/
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Mathieu,
Quoted 45 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 35 lines · liezhi.yang
From: Robert Yang <[email protected]>
* 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/shand 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
Quoted 8 lines
- Drop patch for createrepo-c since it has been upgraded (rev:
804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)* V1 & V2
- Initial version// Robert
Quoted 6 lines
Hi Robert,
Thanks for the new version.
I suspect I still need to get some gettext patch with it. Either yours or the one from the glibc upgrade series. Is that right?
I think you meat the following oe-selftest error:
ERROR: glib-2.0-1_2.86.4-r0 do_package_qa: QA Issue: glib-2.0-ptest rdepends on locale-base-c, but it isn't a build dependency? [build-deps]
I can reproduce it with pure master branch: (rev: 438afb3ded629408172c4bd7d556c5d2abacd631) PACKAGE_CLASSES = "package_rpm"OE_FRAGMENTS += 'core/yocto-autobuilder/autobuilder'
MACHINE = 'qemux86-64'
IMAGE_INSTALL:append = " glibc-utils localedef"GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8 en_US.ISO-8859-1 de_DE.UTF-8 fr_FR.ISO-8859-1 zh_HK.BIG5-HKSCS tr_TR.UTF-8" IMAGE_LINGUAS:append = " en-us fr-fr"
$ bitbake glibc-2.0
So I don't think it's caused by rpm 6 or gettext upgrading, and we don't need other patches.
I will check how to fix the glib-2.0 issues, but it's not related to rpm 6.
// Robert
Quoted 17 lines
https://lore.kernel.org/openembedded-core/[email protected]/
https://lore.kernel.org/openembedded-core/[email protected]/Thanks,
Mathieu-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#232983): https://lists.openembedded.org/g/openembedded-core/message/232983
Mute This Topic: https://lists.openembedded.org/mt/118279443/7304958
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 72 lines · Robert Yang
Hi Mathieu,
Quoted 45 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 35 lines · liezhi.yang
From: Robert Yang <[email protected]>
* 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/shand 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
Quoted 8 lines
- Drop patch for createrepo-c since it has been upgraded (rev:
804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)* V1 & V2
- Initial version// Robert
Quoted 6 lines
Hi Robert,
Thanks for the new version.
I suspect I still need to get some gettext patch with it. Either yours or the one from the glibc upgrade series. Is that right?
I think you meat the following oe-selftest error:
ERROR: glib-2.0-1_2.86.4-r0
do_package_qa: QA Issue: glib-2.0-ptest rdepends on locale-base-c, but it isn't a build dependency? [build-deps]I can reproduce it with pure master branch: (rev:
438afb3ded629408172c4bd7d556c5d2abacd631)PACKAGE_CLASSES= "package_rpm"OE_FRAGMENTS+= 'core/yocto-autobuilder/autobuilder' MACHINE = 'qemux86-64'IMAGE_INSTALL:append = " glibc-utils localedef"
GLIBC_GENERATE_LOCALES= "en_US.UTF-8 fr_FR.UTF-8 en_US.ISO-8859-1 de_DE.UTF-8 fr_FR.ISO-8859-1 zh_HK.BIG5-HKSCS tr_TR.UTF-8" IMAGE_LINGUAS:append = " en-us fr-fr"
Quoted 9 lines
$ bitbake glibc-2.0So I don't think it's caused by rpm 6 or gettext upgrading, and we don't need other patches.
I will check how to fix the glib-2.0 issues, but it's not related to rpm 6.
// Robert
No sorry, I didn't mean anything specific. I did not had the time to launch a build with this series so far, I just wanted to be sure about the requirements.
Build will start in a few minutes.
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 72 lines · Robert Yang
Hi Mathieu,
Quoted 45 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 35 lines · liezhi.yang
From: Robert Yang <[email protected]>
* 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/shand 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
Quoted 8 lines
- Drop patch for createrepo-c since it has been upgraded (rev:
804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)* V1 & V2
- Initial version// Robert
Quoted 6 lines
Hi Robert,
Thanks for the new version.
I suspect I still need to get some gettext patch with it. Either yours or the one from the glibc upgrade series. Is that right?
I think you meat the following oe-selftest error:
ERROR: glib-2.0-1_2.86.4-r0
do_package_qa: QA Issue: glib-2.0-ptest rdepends on locale-base-c, but it isn't a build dependency? [build-deps]I can reproduce it with pure master branch: (rev:
438afb3ded629408172c4bd7d556c5d2abacd631)PACKAGE_CLASSES= "package_rpm"OE_FRAGMENTS+= 'core/yocto-autobuilder/autobuilder' MACHINE = 'qemux86-64'IMAGE_INSTALL:append = " glibc-utils localedef"
GLIBC_GENERATE_LOCALES= "en_US.UTF-8 fr_FR.UTF-8 en_US.ISO-8859-1 de_DE.UTF-8 fr_FR.ISO-8859-1 zh_HK.BIG5-HKSCS tr_TR.UTF-8" IMAGE_LINGUAS:append = " en-us fr-fr"
Quoted 9 lines
$ bitbake glibc-2.0So I don't think it's caused by rpm 6 or gettext upgrading, and we don't need other patches.
I will check how to fix the glib-2.0 issues, but it's not related to rpm 6.
// Robert
Hi Robert,
So yes, I have this issue, and I'm not having it without your series:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/3399
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/3290
https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/3517
And some reproducibility error:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3579
I will try to build just your series on top of master and compare with master. Maybe some strange combination with the glibc upgrade.
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 90 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 72 lines · Robert Yang
Hi Mathieu,
Quoted 45 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 35 lines · liezhi.yang
From: Robert Yang <[email protected]>
* 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/shand 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
Quoted 8 lines
- Drop patch for createrepo-c since it has been upgraded (rev:
804a238c8a4e86c2bcfb2192d54cb861d5fd32a6)* V1 & V2
- Initial version// Robert
Quoted 6 lines
Hi Robert,
Thanks for the new version.
I suspect I still need to get some gettext patch with it. Either yours or the one from the glibc upgrade series. Is that right?
I think you meat the following oe-selftest error:
ERROR: glib-2.0-1_2.86.4-r0
do_package_qa: QA Issue: glib-2.0-ptest rdepends on locale-base-c, but it isn't a build dependency? [build-deps]I can reproduce it with pure master branch: (rev:
438afb3ded629408172c4bd7d556c5d2abacd631)PACKAGE_CLASSES= "package_rpm"OE_FRAGMENTS+= 'core/yocto-autobuilder/autobuilder' MACHINE = 'qemux86-64'IMAGE_INSTALL:append = " glibc-utils localedef"
GLIBC_GENERATE_LOCALES= "en_US.UTF-8 fr_FR.UTF-8 en_US.ISO-8859-1 de_DE.UTF-8 fr_FR.ISO-8859-1 zh_HK.BIG5-HKSCS tr_TR.UTF-8" IMAGE_LINGUAS:append = " en-us fr-fr"Quoted 9 lines
$ bitbake glibc-2.0So I don't think it's caused by rpm 6 or gettext upgrading, and we don't need other patches.
I will check how to fix the glib-2.0 issues, but it's not related to rpm 6.
// Robert
Hi Robert,
So yes, I have this issue, and I'm not having it without your series:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/3399
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/3290
https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/3517
Quoted 6 lines
And some reproducibility error:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3579I will try to build just your series on top of master and compare with master. Maybe some strange combination with the glibc upgrade.
Ok, so here is an a-full build with RPM patches applied directly on top of master: we have the same issues as yesterday:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3410
selftests:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/3526
https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/3420
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/3298
reproducible:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3592
By comparison, here is an a-full build on master:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3414
I there any test I can do to help you?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Everyone,
Sumanth (CCed) has joined Wind River and will pick up where Robert left off unless someone has things underway already. Sumanth doesn't have Robert's deep knowledge of rpm but he is an experienced developer and will make this a top priority immediately.
The first step will be to refresh the patchset locally without changing much but then he'll update to either 6.0.2 or 6.1-rc2. What do people advise for the version?
../Randy
Quoted 124 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 87 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 70 lines · Robert Yang
Hi Mathieu,
Quoted 42 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 41 lines · liezhi.yang
From: Robert Yang<[email protected]>
* 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/shand 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 versionQuoted 8 lines
Quoted 2 lines
// Robert
Hi Robert,
Thanks for the new version.
I suspect I still need to get some gettext patch with it. Either yours or the one from the glibc upgrade series. Is that right?
I think you meat the following oe-selftest error:
ERROR: glib-2.0-1_2.86.4-r0
do_package_qa: QA Issue: glib-2.0-ptest rdepends on locale-base-c, but it isn't a build dependency? [build-deps]I can reproduce it with pure master branch: (rev:
438afb3ded629408172c4bd7d556c5d2abacd631)PACKAGE_CLASSES= "package_rpm"OE_FRAGMENTS+= 'core/yocto-autobuilder/autobuilder' MACHINE = 'qemux86-64'IMAGE_INSTALL:append = " glibc-utils localedef"
GLIBC_GENERATE_LOCALES= "en_US.UTF-8 fr_FR.UTF-8 en_US.ISO-8859-1 de_DE.UTF-8 fr_FR.ISO-8859-1 zh_HK.BIG5-HKSCS tr_TR.UTF-8" IMAGE_LINGUAS:append = " en-us fr-fr"Quoted 9 lines
$ bitbake glibc-2.0So I don't think it's caused by rpm 6 or gettext upgrading, and we don't need other patches.
I will check how to fix the glib-2.0 issues, but it's not related to rpm 6.
// Robert
Hi Robert,
So yes, I have this issue, and I'm not having it without your series:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/3399
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/3290
https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/3517Quoted 6 lines
And some reproducibility error:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3579I will try to build just your series on top of master and compare with master. Maybe some strange combination with the glibc upgrade.
Ok, so here is an a-full build with RPM patches applied directly on top of master: we have the same issues as yesterday:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3410
selftests:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/3526
https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/3420
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/3298reproducible:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3592By comparison, here is an a-full build on master:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/3414I there any test I can do to help you?
Thanks,
Mathieu-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#233072):https://lists.openembedded.org/g/openembedded-core/message/233072 Mute This Topic:https://lists.openembedded.org/mt/118279443/3616765
Group Owner:[email protected] Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
# Randy MacLeod # Wind River Linux
Quoted 7 lines · Randy MacLeod via lists.openembedded.org
Sumanth (CCed) has joined Wind River and will pick up where Robert left off unless someone has things underway already. Sumanth doesn't have Robert's deep knowledge of rpm but he is an experienced developer and will make this a top priority immediately.
The first step will be to refresh the patchset locally without changing much but then he'll update to either 6.0.2 or 6.1-rc2. What do people advise for the version?
Thanks! As tempting as it is to push for the latest version, I'd say 6.0.2 first. This way there's less rebasing, a less steep learning curve, and Sumanth won't be overwhelmed by failures.
Alex
v9 cover rpm: 4.20.1 -> 6.0.2
* 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
Continuing Robert's work.
--
# Sumanth Gavini
# Wind River Linux
-----------------------------------------------------------------------
Sumanth Gavini (8):
package_rpm.bbclass: Drop external dependency generator to support rpm
6
package_rpm.bbclass: Define _lib and _libdir for rpmbuild lib/oe/package.py: Don't add ldconfig_postinst_fragment for glibc or
musl
lib/oe/package.py: Filter out /usr/bin/pkg-config file dependency lib/oe/package.py: Don't redirect stderr
target-sdk-provides-dummy: Add pkg-config to DUMMYPROVIDES
rpm: 4.20.1 -> 6.0.2
libarchive: Make it work with rpm 6
meta/classes-global/package_rpm.bbclass | 90 +-
meta/lib/oe/package.py | 19 +-
meta/recipes-core/glibc/glibc-package.inc | 5 +
.../meta/nativesdk-sdk-provides-dummy.bb | 1 +
.../meta/target-sdk-provides-dummy.bb | 1 +
meta/recipes-core/musl/musl_git.bb | 4 +
...olor-setting-for-mips64_n32-binaries.patch | 22 +-
...akeLists.txt-Fix-checking-for-CFLAGS.patch | 46 -
...et-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch | 50 -
...satisfiable-dependency-when-building.patch | 18 +-
...lib-rpm-as-the-installation-path-for.patch | 24 +-
...1-Do-not-read-config-files-from-HOME.patch | 18 +-
...-PATH-environment-variable-before-ru.patch | 16 +-
...lling-execute-package-scriptlets-wit.patch | 12 +-
...not-insert-payloadflags-into-.rpm-me.patch | 18 +-
....c-fix-file-conflicts-for-MIPS64-N32.patch | 18 +-
...kgverify_level-to-digest-as-RCPM-4.2.patch | 35 +
...ools-elfdeps.cc-Remove-format-module.patch | 38 +
...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 26 +-
...avoid-using-GLOB_BRACE-if-undefined-.patch | 14 +-
...ge-logging-level-around-scriptlets-t.patch | 14 +-
.../rpm/{rpm_4.20.1.bb => rpm_6.0.2.bb} | 14 +-
...end_filter-Keep-iterating-even-if-na.patch | 49 +
...egister_bidder-Allow-ARCHIVE_STATE_H.patch | 46 +
...er-into-a-proper-format-supporting-b.patch | 1693 +++++++++++++++++
.../libarchive/libarchive_3.8.8.bb | 3 +
26 files changed, 2023 insertions(+), 271 deletions(-)
delete mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-Fix-checking-for-CFLAGS.patch
delete mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-set-libdir-to-CMAKE_INSTALL_FULL_LIBD.patch
create mode 100644 meta/recipes-devtools/rpm/files/0001-macros.in-Set-_pkgverify_level-to-digest-as-RCPM-4.2.patch
create mode 100644 meta/recipes-devtools/rpm/files/0001-tools-elfdeps.cc-Remove-format-module.patch
rename meta/recipes-devtools/rpm/{rpm_4.20.1.bb => rpm_6.0.2.bb} (96%)
create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch
create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patchPATCH v9 1/8 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 v9 2/8 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 v9 3/8 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
@@ -1853,7 +1853,8 @@ def process_shlibs(pkgfiles, d): if s[0] not in shlib_provider: shlib_provider[s[0]] = {} shlib_provider[s[0]][s[1]] = (pkg, pkgver) - if needs_ldconfig: + if needs_ldconfig and \ + not bb.utils.to_boolean(d.getVar('SKIP_LDCONFIG_POSTINST_FRAGMENT:%s' % pkg)): bb.debug(1, 'adding ldconfig call to postinst for %s' % pkg) postinst = d.getVar('pkg_postinst:%s' % pkg) if not postinst:
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 v9 4/8 lib/oe/package.py: Filter out /usr/bin/pkg-config file dependency
In reply to Sumanth GaviniRPM's pkgconfig.attr fileattr auto-detects /usr/bin/pkg-config as a Requires dependency for any package that ships .pc files. This causes every -dev package to have a hard runtime dependency on pkg-config.
pkg-config is a development/build tool used at compile time to locate libraries and flags via .pc files. It is not required at runtime on the target.
Without this filter, do_rootfs and do_populate_sdk fail with errors like:
Error: nothing provides /usr/bin/pkg-config needed by python3-dev-3.14.6-r0.x86_64_v3 from oe-repo
This is triggered when IMAGE_FEATURES includes "ptest-pkgs" or "dev-pkgs", or when building SDKs, because -dev packages are pulled in and dnf cannot resolve the /usr/bin/pkg-config file dependency.
The fix filters this dependency at package generation time in filedeprunner(), consistent with the existing filtering of python() and perl() auto-dependencies in the same function.
Note: pkgconfig(foo) symbolic dependencies (e.g., pkgconfig(glib-2.0)) are NOT affected by this filter they continue to work correctly for build-time dependency resolution.
--- meta/lib/oe/package.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
meta/lib/oe/package.py +14 -0
@@ -253,6 +253,20 @@ def filedeprunner(pkg, pkgfiles, rpmdeps, pkgdest): if dep.startswith("python("): continue + # Ignore the file dependency on /usr/bin/pkg-config. RPM's + # pkgconfig.attr fileattr auto-detects this as a Requires for + # any package that ships .pc files. However, pkg-config is a + # development/build tool used at compile time to locate + # libraries and their flags — it is not needed at runtime. + # Without this filter, every -dev package would pull in + # pkg-config as a hard runtime dependency, causing do_rootfs + # and do_populate_sdk failures when pkg-config is not + # explicitly included in IMAGE_INSTALL or TOOLCHAIN_TARGET_TASK. + # This is consistent with how we already filter python() and + # perl() auto-dependencies above. + if dep == '/usr/bin/pkg-config': + continue + # Ignore all perl(VMS::...) and perl(Mac::...) dependencies. These # are typically used conditionally from the Perl code, but are # generated as unconditional dependencies.
PATCH v9 5/8 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
@@ -291,7 +291,7 @@ def filedeprunner(pkg, pkgfiles, rpmdeps, pkgdest): return provides, requires - output = subprocess.check_output(shlex.split(rpmdeps) + pkgfiles, stderr=subprocess.STDOUT).decode("utf-8") + output = subprocess.check_output(shlex.split(rpmdeps) + pkgfiles).decode("utf-8") provides, requires = process_deps(output, pkg, pkgdest, provides, requires) return (pkg, provides, requires)
PATCH v9 6/8 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 v9 7/8 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 = "\
PATCH v9 8/8 libarchive: Make it work with rpm 6
In reply to Sumanth GaviniThe patch is from:
https://github.com/libarchive/libarchive/pull/2846
Fixed:
$ oe-selftest -r debuginfod.Debuginfod.test_debuginfod_native
cannot open archive from pipe /path/to/tmp-debuginfod/work/x86-64-v3-poky-linux/xz/5.8.2/localpkgfeed/x86_64_v3/bash-locale-vi-5.3-r0.x86_64_v3.rpm libarchive error: cannot open archive from pipe: Unrecognized archive format
exceptions encountered during archive scan
--- ...end_filter-Keep-iterating-even-if-na.patch | 49 + ...egister_bidder-Allow-ARCHIVE_STATE_H.patch | 46 + ...er-into-a-proper-format-supporting-b.patch | 1693 +++++++++++++++++ .../libarchive/libarchive_3.8.8.bb | 3 + 4 files changed, 1791 insertions(+) create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch
meta/recipes-extended/libarchive/libarchive/0001-archive_read_append_filter-Keep-iterating-even-if-na.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 26401df2e74e6d72e86fab165445949c9dd3eba9 Mon Sep 17 00:00:00 2001 +From: Davide Beatrici <[email protected]> +Date: Sat, 21 Feb 2026 02:55:40 +0100 +Subject: [PATCH 1/3] archive_read_append_filter(): Keep iterating even if name + is null + +While working on the RPM format I noticed the zstd filter failed to append. + +Turns out there are two unknown filters that are registered with a null name: + +bidder candidate bzip2 +bidder candidate compress (.Z) +bidder candidate gzip +bidder candidate lzip +bidder candidate lzma +bidder candidate xz +bidder candidate uu +bidder candidate lrzip +bidder candidate (null) +bidder candidate (null) +bidder candidate lz4 +bidder candidate zstd + +I'm not sure if anonymous filters are expected behavior, but I believe this change doesn't hurt. + +Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/2846] + +Signed-off-by: Robert Yang <[email protected]> +Signed-off-by: Sumanth Gavini <[email protected]> +--- + libarchive/archive_read_append_filter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_append_filter.c b/libarchive/archive_read_append_filter.c +index cd88df11..9475b704 100644 +--- a/libarchive/archive_read_append_filter.c ++++ b/libarchive/archive_read_append_filter.c +@@ -117,7 +117,7 @@ archive_read_append_filter(struct archive *_a, int code) + bidder = a->bidders; + for (i = 1; i < number_bidders; i++, bidder++) + { +- if (!bidder->name || !strcmp(bidder->name, str)) ++ if (bidder->name && !strcmp(bidder->name, str)) + break; + } + if (!bidder->name || strcmp(bidder->name, str)) +-- +2.49.0 +
meta/recipes-extended/libarchive/libarchive/0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch new file +46 -0
46 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive/0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch new file +1693 -0
1,693 lines not on this page · raw message
meta/recipes-extended/libarchive/libarchive_3.8.8.bb +3 -0
@@ -31,6 +31,9 @@ EXTRA_OECONF += "--enable-largefile --without-iconv" SRC_URI = "https://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://run-ptest \ + file://0001-archive_read_append_filter-Keep-iterating-even-if-na.patch \ + file://0002-__archive_read_register_bidder-Allow-ARCHIVE_STATE_H.patch \ + file://0003-Convert-RPM-reader-into-a-proper-format-supporting-b.patch \ " UPSTREAM_CHECK_URI = "https://www.libarchive.org/"
Re: [OE-core] [PATCH v9 0/8] rpm: 4.20.1 -> 6.0.2
In reply to Sumanth GaviniQuoted 18 lines · Sumanth Gavini via lists.openembedded.org
* 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-configfile dependency, "bitbake core-image-sato -cpopulate_sdk" completes successfully without the patch.
- Fixed the filtering of the/usr/bin/pkg-configfile dependency. pkg-config is a build-time tool, not a runtime dependency. Filtered the/usr/bin/pkg-configdependency 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.
Quoted 8 lines
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 -cpopulate_sdk"
I think this series may be causing a failure in libarchive ptest building:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/50/builds/4241
Cheers,
Richard
Re: [PATCH v9 0/8] rpm: 4.20.1 -> 6.0.2
I also get libarchive ptest building failures:
``` sections -fdata-sections -fvisibility=hidden -D__LIBARCHIVE_ENABLE_VISIBILITY -c -o libarchive/test/test-test_sparse_basic.o `test -f 'libarchive/test/test_sparse_basic.c' || echo '../sources/libarchive-3.8.8/'`libarchive/test/test_sparse_basic.c | ../sources/libarchive-3.8.8/libarchive/test/test_read_set_format.c: In function 'test_read_append_rpm_filter': | ../sources/libarchive-3.8.8/libarchive/test/test_read_set_format.c:353:37: error: 'ARCHIVE_FILTER_RPM' undeclared (first use in this function); did you mean 'ARCHIVE_FILTER_UU'? | 353 | r = archive_read_append_filter(a, ARCHIVE_FILTER_RPM); | | ^~~~~~~~~~~~~~~~~~ | | ARCHIVE_FILTER_UU | ../sources/libarchive-3.8.8/libarchive/test/test_read_set_format.c:353:37: note: each undeclared identifier is reported only once for each function it appears in | make[2]: *** [Makefile:15465: libarchive/test/test-test_read_set_format.o] Error 1 ```
Re: [OE-core] [PATCH v9 0/8] rpm: 4.20.1 -> 6.0.2
In reply to Richard PurdieQuoted 31 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 18 lines · Sumanth Gavini via lists.openembedded.org
* 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-configfile dependency, "bitbake core-image-sato -cpopulate_sdk" completes successfully without the patch.
- Fixed the filtering of the/usr/bin/pkg-configfile dependency. pkg-config is a build-time tool, not a runtime dependency. Filtered the/usr/bin/pkg-configdependency 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.Quoted 8 lines
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 -cpopulate_sdk"
Quoted 7 lines
I think this series may be causing a failure in libarchive ptest building:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/50/builds/4241
Cheers,
Richard
The ARCHIVE_FILTER_RPM macro was commented out in a previous libarchive change, Restore the macro definition. The ptest now compiles and passes successfully.
I have sent the v10 patch with these changes
--
# Sumanth Gavini
# Wind River Linux