* [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen
@ 2024-01-26 13:34 Alexander Kanavin
2024-01-26 13:34 ` [PATCH 2/8] classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS Alexander Kanavin
` (6 more replies)
0 siblings, 7 replies; 20+ messages in thread
From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexander Kanavin
This exposes the following failure in a multilib setup, when everything
up to do_package_write_rpm is in sstate, but do_package_write_rpm is not
(there's a similar fail for lib64-man-db, and the failures themselves will be fixed separately
in the next commit):
Exception: subprocess.CalledProcessError: Command '/srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/recipe-sysroot/usr/bin/postinst-base-passwd' returned non-zero exit status 1.
Subprocess output:
install: cannot stat '/srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/lib64-recipe-sysroot/usr/share/base-passwd/passwd.master': No such file or directory
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
meta/classes/useradd.bbclass | 2 +-
meta/recipes-core/base-passwd/base-passwd_3.6.3.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index cb809b5dd74..a58f8287c96 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -167,7 +167,7 @@ python useradd_sysroot_sstate () {
if scriptfile:
bb.utils.mkdirhier(os.path.dirname(scriptfile))
with open(scriptfile, 'w') as script:
- script.write("#!/bin/sh\n")
+ script.write("#!/bin/sh -e\n")
bb.data.emit_func("useradd_sysroot", script, d)
script.write("useradd_sysroot\n")
os.chmod(scriptfile, 0o755)
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb
index 9d7703b1c00..bf50b01fd5a 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb
@@ -54,7 +54,7 @@ do_install () {
}
basepasswd_sysroot_postinst() {
-#!/bin/sh
+#!/bin/sh -e
# Install passwd.master and group.master to sysconfdir
install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir}
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 2/8] classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS 2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin @ 2024-01-26 13:34 ` Alexander Kanavin 2024-01-26 13:34 ` [PATCH 3/8] classes/staging: capture output of sysroot postinsts into logs Alexander Kanavin ` (5 subsequent siblings) 6 siblings, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Otherwise, PACKAGE_WRITE_DEPS would contain non-multilib variants of dependencies even when building multilib items, resulting in sysroots being populated with entirely wrong versions of them. This hasn't been noticed until now through sheer (bad) luck, I think, except in the cpio recipe, but the previous commit shows that the issues did occur, quietly. Every other recipe in oe-core and meta-oe does not prepend the multilib prefix. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/classes/multilib.bbclass | 1 + meta/recipes-extended/cpio/cpio_2.14.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index d80a34cf27f..b6c09969b19 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -140,6 +140,7 @@ python multilib_virtclass_handler_postkeyexp () { return clsextend.map_depends_variable("DEPENDS") + clsextend.map_depends_variable("PACKAGE_WRITE_DEPS") clsextend.map_variable("PROVIDES") if bb.data.inherits_class('cross-canadian', d): diff --git a/meta/recipes-extended/cpio/cpio_2.14.bb b/meta/recipes-extended/cpio/cpio_2.14.bb index 560038d2a67..397bb5d87c1 100644 --- a/meta/recipes-extended/cpio/cpio_2.14.bb +++ b/meta/recipes-extended/cpio/cpio_2.14.bb @@ -65,7 +65,7 @@ do_install_ptest_base:append() { # The tests need to run as a non-root user, so pull in the ptest user DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" -PACKAGE_WRITE_DEPS:append:class-target = " ${MLPREFIX}ptest-runner" +PACKAGE_WRITE_DEPS += "ptest-runner" RDEPENDS:${PN}-ptest += "ptest-runner" -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/8] classes/staging: capture output of sysroot postinsts into logs 2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin 2024-01-26 13:34 ` [PATCH 2/8] classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS Alexander Kanavin @ 2024-01-26 13:34 ` Alexander Kanavin 2024-01-26 13:34 ` [PATCH 4/8] classes/package_rpm: write file permissions and ownership explicitly into .spec Alexander Kanavin ` (4 subsequent siblings) 6 siblings, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin This particularly helps with user management postinsts as otherwise there's no trace left of what was run, in which order, and what was the output. Here's an example from the logs: NOTE: Running postinst /srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/lib64-recipe-sysroot/usr/bin/postinst-lib64-base-passwd, output: b'/srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/recipe-sysroot-native/usr/sbin/useradd\nRunning useradd commands...\nNOTE: lib64-ptest-runner: Performing useradd with [--root /srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/lib64-recipe-sysroot --system --no-create-home --home / --user-group ptest]\n' NOTE: Running postinst /srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/lib64-recipe-sysroot/usr/bin/postinst-useradd-lib64-ptest-runner, output: b'/srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/recipe-sysroot-native/usr/sbin/useradd\nRunning useradd commands...\nNOTE: lib64-ptest-runner: Performing useradd with [--root /srv/storage/alex/yocto/build-multilib/tmp/work/x86_64-pokymllib64-linux/lib64-quilt/0.67/lib64-recipe-sysroot --system --no-create-home --home / --user-group ptest]\nNOTE: lib64-ptest-runner: user ptest already exists, not re-creating it\n' Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/classes-global/staging.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index cf1e4600fd6..ab3e1d71b52 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -246,7 +246,7 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): staging_processfixme(fixme, targetdir, targetsysroot, nativesysroot, d) for p in postinsts: - subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT) + bb.note("Running postinst {}, output:\n{}".format(p, subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT))) # # Manifests here are complicated. The main sysroot area has the unpacked sstate @@ -630,7 +630,7 @@ python extend_recipe_sysroot() { staging_processfixme(fixme[f], f, recipesysroot, recipesysrootnative, d) for p in postinsts: - subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT) + bb.note("Running postinst {}, output:\n{}".format(p, subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT))) for dep in manifests: c = setscenedeps[dep][0] -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/8] classes/package_rpm: write file permissions and ownership explicitly into .spec 2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin 2024-01-26 13:34 ` [PATCH 2/8] classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS Alexander Kanavin 2024-01-26 13:34 ` [PATCH 3/8] classes/staging: capture output of sysroot postinsts into logs Alexander Kanavin @ 2024-01-26 13:34 ` Alexander Kanavin 2024-01-26 13:34 ` [PATCH 5/8] classes/package_rpm: use weak user/group dependencies Alexander Kanavin ` (3 subsequent siblings) 6 siblings, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Per https://github.com/rpm-software-management/rpm/commit/77d3529c31ca090a40b8d3959a0bcdd721a556d6 rpm 4.19.1+ will not consider actual filesystem permissions and ownership, and will quietly default to root if not expictly set otherwise in .spec file. There's also additional diagnostics (printing what is in passwd/group) when user/group name lookup against the sysroot fails. That is never supposed to happen, and yet there was one report that it did: https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/8493/steps/23/logs/stdio Investigating that issue led to the first three commits in this patchset: sysroot user management postinsts: run with /bin/sh -e to report errors when they happen classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS classes/staging: capture output of sysroot postinsts into logs Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/classes-global/package_rpm.bbclass | 34 ++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 2fc18fe98c1..a641dbdb299 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -103,6 +103,7 @@ def write_rpm_perfiledata(srcname, d): python write_specfile () { import oe.packagedata + import os,pwd,grp,stat # append information for logs and patches to %prep def add_prep(d, spec_files_bottom): @@ -198,6 +199,23 @@ python write_specfile () { # of the walk, the isdir() test would then fail and the walk code would assume its a file # hence we check for the names in files too. for rootpath, dirs, files in os.walk(walkpath): + def get_attr(path): + stat_f = os.stat(rootpath + "/" + path, follow_symlinks=False) + mode = stat.S_IMODE(stat_f.st_mode) + try: + owner = pwd.getpwuid(stat_f.st_uid).pw_name + except Exception as e: + bb.error("Content of /etc/passwd in sysroot:\n{}".format( + open(d.getVar("RECIPE_SYSROOT") +"/etc/passwd").read())) + raise e + try: + group = grp.getgrgid(stat_f.st_gid).gr_name + except Exception as e: + bb.error("Content of /etc/group in sysroot:\n{}".format( + open(d.getVar("RECIPE_SYSROOT") +"/etc/group").read())) + raise e + return "%attr({:o},{},{}) ".format(mode, owner, group) + path = rootpath.replace(walkpath, "") if path.endswith("DEBIAN") or path.endswith("CONTROL"): continue @@ -221,24 +239,28 @@ python write_specfile () { if dir == "CONTROL" or dir == "DEBIAN": continue dir = dir.replace("%", "%%%%%%%%") + p = path + '/' + dir # All packages own the directories their files are in... - target.append('%dir "' + path + '/' + dir + '"') + target.append(get_attr(dir) + '%dir "' + p + '"') else: # packages own only empty directories or explict directory. # This will prevent the overlapping of security permission. + attr = get_attr(path) if path and not files and not dirs: - target.append('%dir "' + path + '"') + target.append(attr + '%dir "' + path + '"') elif path and path in dirfiles: - target.append('%dir "' + path + '"') + target.append(attr + '%dir "' + path + '"') for file in files: if file == "CONTROL" or file == "DEBIAN": continue file = file.replace("%", "%%%%%%%%") - if conffiles.count(path + '/' + file): - target.append('%config "' + path + '/' + file + '"') + attr = get_attr(file) + p = path + '/' + file + if conffiles.count(p): + target.append(attr + '%config "' + p + '"') else: - target.append('"' + path + '/' + file + '"') + target.append(attr + '"' + p + '"') # Prevent the prerm/postrm scripts from being run during an upgrade def wrap_uninstall(scriptvar): -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 5/8] classes/package_rpm: use weak user/group dependencies 2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin ` (2 preceding siblings ...) 2024-01-26 13:34 ` [PATCH 4/8] classes/package_rpm: write file permissions and ownership explicitly into .spec Alexander Kanavin @ 2024-01-26 13:34 ` Alexander Kanavin 2024-01-26 13:34 ` [PATCH 6/8] classes/package_rpm: set bogus locations for passwd/group files Alexander Kanavin ` (2 subsequent siblings) 6 siblings, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin rpm 4.19 automatically generates provides and depends for user and groups: https://github.com/rpm-software-management/rpm/blob/rpm-4.19.x/docs/manual/users_and_groups.md#dependencies This mechanism relies on sysusers.d for the 'provides' part, and thus is systemd-only at best. So we need to disable it for now, otherwise image generation fails with unresolved dependencies. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/classes-global/package_rpm.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index a641dbdb299..3ca6c5aa7b3 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -721,6 +721,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 '_use_weak_usergroup_deps 1'" if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_RPMOUTDIR') + "'" -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 6/8] classes/package_rpm: set bogus locations for passwd/group files 2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin ` (3 preceding siblings ...) 2024-01-26 13:34 ` [PATCH 5/8] classes/package_rpm: use weak user/group dependencies Alexander Kanavin @ 2024-01-26 13:34 ` Alexander Kanavin 2024-01-26 13:34 ` [PATCH 7/8] oeqa/runtime/rpm: fail tests if test rpm file cannot be found Alexander Kanavin 2024-01-26 13:34 ` [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 Alexander Kanavin 6 siblings, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Since https://github.com/rpm-software-management/rpm/commit/f3eaeeb7341085e1850e914350cf1f33d538320d rpm does its own parsing of /etc/passwd and /etc/group instead of relying on getpwnam() and friends. This has an unfortunate effect of leaking build host uid/gid values for users and groups into the cpio header inside rpm file (where previously those were always zero). Installation of rpm packages relies on rpm header to set files ownership, and that is a different structure that is build from .spec information, so we can avoid host contamination by setting the paths to something bogus. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/classes-global/package_rpm.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 3ca6c5aa7b3..e0f4de42a15 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -722,6 +722,8 @@ python do_package_rpm () { cmd = cmd + " --define 'debug_package %{nil}'" cmd = cmd + " --define '_tmppath " + workdir + "'" cmd = cmd + " --define '_use_weak_usergroup_deps 1'" + cmd = cmd + " --define '_passwd_path " + "/completely/bogus/path" + "'" + cmd = cmd + " --define '_group_path " + "/completely/bogus/path" + "'" if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_RPMOUTDIR') + "'" -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 7/8] oeqa/runtime/rpm: fail tests if test rpm file cannot be found 2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin ` (4 preceding siblings ...) 2024-01-26 13:34 ` [PATCH 6/8] classes/package_rpm: set bogus locations for passwd/group files Alexander Kanavin @ 2024-01-26 13:34 ` Alexander Kanavin 2024-01-26 14:11 ` [OE-core] " Richard Purdie 2024-01-26 13:34 ` [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 Alexander Kanavin 6 siblings, 1 reply; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Discovery of the test file was happening in a class initializer. That block of code cannot fail (it's not a test), and so it falls through to completion even if the needed file could not be found. Then the tests themselves fail later due to class variables not being set, but all information as to why is already lost at that point. This converts the discovery to a helper function called from the tests, so that the function can fail the tests precisely when the problems occur. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/lib/oeqa/runtime/cases/rpm.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/rpm.py b/meta/lib/oeqa/runtime/cases/rpm.py index a4ba4e67698..ea5619ffea4 100644 --- a/meta/lib/oeqa/runtime/cases/rpm.py +++ b/meta/lib/oeqa/runtime/cases/rpm.py @@ -80,21 +80,24 @@ class RpmBasicTest(OERuntimeTestCase): class RpmInstallRemoveTest(OERuntimeTestCase): - @classmethod - def setUpClass(cls): - pkgarch = cls.td['TUNE_PKGARCH'].replace('-', '_') - rpmdir = os.path.join(cls.tc.td['DEPLOY_DIR'], 'rpm', pkgarch) + def _find_test_file(self): + pkgarch = self.td['TUNE_PKGARCH'].replace('-', '_') + rpmdir = os.path.join(self.tc.td['DEPLOY_DIR'], 'rpm', pkgarch) # Pick base-passwd-doc as a test file to get installed, because it's small # and it will always be built for standard targets rpm_doc = 'base-passwd-doc-*.%s.rpm' % pkgarch if not os.path.exists(rpmdir): - return + self.fail("Rpm directory {} does not exist".format(rpmdir)) for f in fnmatch.filter(os.listdir(rpmdir), rpm_doc): - cls.test_file = os.path.join(rpmdir, f) - cls.dst = '/tmp/base-passwd-doc.rpm' + self.test_file = os.path.join(rpmdir, f) + break + else: + self.fail("Couldn't find the test rpm file {} in {}".format(rpm_doc, rpmdir)) + self.dst = '/tmp/base-passwd-doc.rpm' @OETestDepends(['rpm.RpmBasicTest.test_rpm_query']) def test_rpm_install(self): + self._find_test_file() self.tc.target.copyTo(self.test_file, self.dst) status, output = self.target.run('rpm -ivh /tmp/base-passwd-doc.rpm') msg = 'Failed to install base-passwd-doc package: %s' % output @@ -117,6 +120,7 @@ class RpmInstallRemoveTest(OERuntimeTestCase): Author: Alexander Kanavin <alex.kanavin@gmail.com> AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> """ + self._find_test_file() db_files_cmd = 'ls /var/lib/rpm/rpmdb.sqlite*' check_log_cmd = "grep RPM /var/log/messages | wc -l" -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 7/8] oeqa/runtime/rpm: fail tests if test rpm file cannot be found 2024-01-26 13:34 ` [PATCH 7/8] oeqa/runtime/rpm: fail tests if test rpm file cannot be found Alexander Kanavin @ 2024-01-26 14:11 ` Richard Purdie 2024-01-26 14:21 ` Alexander Kanavin 0 siblings, 1 reply; 20+ messages in thread From: Richard Purdie @ 2024-01-26 14:11 UTC (permalink / raw) To: Alexander Kanavin, openembedded-core; +Cc: Alexander Kanavin On Fri, 2024-01-26 at 14:34 +0100, Alexander Kanavin wrote: > Discovery of the test file was happening in a class initializer. > That block of code cannot fail (it's not a test), and so it > falls through to completion even if the needed file could not be found. Is that true? I thought a failure in the setup function just caused all the tests in that class not to run? I've no issue with the patch itself, I just was surprised to read that. Cheers, Richard ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 7/8] oeqa/runtime/rpm: fail tests if test rpm file cannot be found 2024-01-26 14:11 ` [OE-core] " Richard Purdie @ 2024-01-26 14:21 ` Alexander Kanavin 0 siblings, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 14:21 UTC (permalink / raw) To: Richard Purdie; +Cc: openembedded-core, Alexander Kanavin On Fri, 26 Jan 2024 at 15:11, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > On Fri, 2024-01-26 at 14:34 +0100, Alexander Kanavin wrote: > > Discovery of the test file was happening in a class initializer. > > That block of code cannot fail (it's not a test), and so it > > falls through to completion even if the needed file could not be found. > > Is that true? I thought a failure in the setup function just caused all > the tests in that class not to run? I think I didn't formulate it well enough. The rpm test initalizer was written in a way that it would never fail, even if the needed rpm file actually could not be discovered and the variable for it (used by test cases) would remain None. The reason for it being that way is that the initializer runs even when the build is not-rpm based (e.g. ipk/deb only), and there's no way at that point to detect absence of rpm and skip the whole class (various decorators can be attached to test cases only). Alex ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin ` (5 preceding siblings ...) 2024-01-26 13:34 ` [PATCH 7/8] oeqa/runtime/rpm: fail tests if test rpm file cannot be found Alexander Kanavin @ 2024-01-26 13:34 ` Alexander Kanavin 2024-01-28 16:53 ` [OE-core] " Khem Raj 2024-02-01 21:10 ` Alexandre Belloni 6 siblings, 2 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-26 13:34 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Upstream has replaced autoconf with cmake, which necessitates a rewrite of the recipe and available options, and a rebase to cmake of 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : the patch was removing the NULL marker at the end of function arguments, and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch was restoring it (in addition to the actual change the patch was making). Now both patches preserve the NULL terminator. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ ...satisfiable-dependency-when-building.patch | 12 +-- ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- ...-PATH-environment-variable-before-ru.patch | 12 +-- ...lename-before-passing-it-to-basename.patch | 40 ---------- ...ix-missing-basename-include-on-macOS.patch | 26 ------- ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ ...lling-execute-package-scriptlets-wit.patch | 24 ++---- ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- .../rpm/files/fix-declaration.patch | 39 ---------- .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- 23 files changed, 328 insertions(+), 383 deletions(-) create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch index 9fa486dfd3c..96fe57dfeb8 100644 --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch @@ -1,4 +1,4 @@ -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 9 Mar 2017 18:54:02 +0200 Subject: [PATCH] Add a color setting for mips64_n32 binaries @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 6 insertions(+) diff --git a/build/rpmfc.c b/build/rpmfc.c -index 26606378f..a16e3f4e9 100644 +index 4b67a9bae..ed7e4e623 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c -@@ -646,6 +646,7 @@ exit: +@@ -660,6 +660,7 @@ exit: static const struct rpmfcTokens_s rpmfcTokens[] = { { "directory", RPMFC_INCLUDE }, @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) color = RPMFC_ELF32; break; } @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 if (elf) elf_end(elf); diff --git a/rpmrc.in b/rpmrc.in -index 2975a3a0e..c7232b48b 100644 +index 8646a966b..7349fdfd3 100644 --- a/rpmrc.in +++ b/rpmrc.in -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 archcolor: mips64r6 2 archcolor: mips64r6el 2 diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch new file mode 100644 index 00000000000..5053caae33f --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch @@ -0,0 +1,28 @@ +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 29 Nov 2023 14:06:15 +0100 +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than + cmake modules + +Otherwise cmake will try to find libm, badly, and fail. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f0630453..d0ea565f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,7 +187,7 @@ set(REQFUNCS + ) + + find_package(PkgConfig REQUIRED) +-find_package(Lua 5.2 REQUIRED) ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) + find_package(ZLIB REQUIRED) + find_package(BZip2) + find_package(Iconv) diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch new file mode 100644 index 00000000000..db83b176b41 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch @@ -0,0 +1,42 @@ +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 16 Jan 2024 13:43:36 +0100 +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit + option + +This was lost in autotools -> cmake transition. The particular +reason to make it explicit is that readline is gpl version 3 +licensed, and in some builds components under that license +need to be excluded. + +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0a474106e..89e27417f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) + option(WITH_FSVERITY "Build with fsverity support" OFF) + option(WITH_IMAEVM "Build with IMA support" OFF) + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) ++option(WITH_READLINE "Build with readline support" ON) + + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") +@@ -193,7 +194,11 @@ find_package(BZip2) + find_package(Iconv) + + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) +-pkg_check_modules(READLINE IMPORTED_TARGET readline) ++ ++if (WITH_READLINE) ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) ++endif() ++ + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch index 8440c3516d6..df5543873c1 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch @@ -1,4 +1,4 @@ -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 9 Jan 2017 18:52:11 +0200 Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> build/pack.c | 4 ---- 1 file changed, 4 deletions(-) -Index: git/build/pack.c -=================================================================== ---- git.orig/build/pack.c -+++ git/build/pack.c -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, +diff --git a/build/pack.c b/build/pack.c +index f7dac6d9a..f382c7da0 100644 +--- a/build/pack.c ++++ b/build/pack.c +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); } diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 8fdc5edb10b..b056d19741a 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch @@ -1,4 +1,4 @@ -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 27 Feb 2017 09:43:30 +0200 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - configure.ac | 2 +- - macros.in | 2 +- - rpm.am | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) + CMakeLists.txt | 2 +- + macros.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index e6676c581..ec28db9b6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -942,7 +942,7 @@ else - usrprefix=$prefix - fi +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2767915fb..7f0630453 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) + option(WITH_IMAEVM "Build with IMA support" OFF) + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" -+RPMCONFIGDIR="`echo ${libdir}/rpm`" - AC_SUBST(RPMCONFIGDIR) +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") - AC_SUBST(OBJDUMP) + # Emulate libtool versioning. Before a public release: diff --git a/macros.in b/macros.in -index a2411d784..735b74d99 100644 +index b49ffaad4..3acbe78f6 100644 --- a/macros.in +++ b/macros.in -@@ -930,7 +930,7 @@ package or when debugging this package.\ +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ %_sharedstatedir %{_prefix}/com %_localstatedir %{_prefix}/var %_lib lib @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 %_includedir %{_prefix}/include %_infodir %{_datadir}/info %_mandir %{_datadir}/man -diff --git a/rpm.am b/rpm.am -index 55b5b3935..5a51f102b 100644 ---- a/rpm.am -+++ b/rpm.am -@@ -1,10 +1,10 @@ - # Internal binaries - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm --rpmlibexecdir = $(prefix)/lib/rpm -+rpmlibexecdir = $(libdir)/rpm - - # Host independent config files - ## HACK: it probably should be $(datadir)/rpm --rpmconfigdir = $(prefix)/lib/rpm -+rpmconfigdir = $(libdir)/rpm - - # Libtool version (current-revision-age) for all our libraries - rpm_version_info = 13:0:4 diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch index fda64eefe01..6a18679da2f 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch @@ -1,35 +1,36 @@ -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 10 Jan 2017 14:11:30 +0200 Subject: [PATCH] Do not read config files from $HOME Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- lib/rpmrc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -Index: git/lib/rpmrc.c -=================================================================== ---- git.orig/lib/rpmrc.c -+++ git/lib/rpmrc.c +diff --git a/lib/rpmrc.c b/lib/rpmrc.c +index 269d490ac..f39dcfc11 100644 +--- a/lib/rpmrc.c ++++ b/lib/rpmrc.c @@ -458,8 +458,7 @@ static void setDefaults(void) if (!defrcfiles) { defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", + confdir, "/" RPM_VENDOR "/rpmrc", ":", - SYSCONFDIR "/rpmrc", ":", - "~/.rpmrc", NULL); -+ SYSCONFDIR "/rpmrc", ":"); ++ SYSCONFDIR "/rpmrc", NULL); } #ifndef MACROFILES @@ -471,8 +470,7 @@ static void setDefaults(void) - confdir, "/" RPMCANONVENDOR "/macros", ":", + confdir, "/" RPM_VENDOR "/macros", ":", SYSCONFDIR "/rpm/macros.*", ":", SYSCONFDIR "/rpm/macros", ":", - SYSCONFDIR "/rpm/%{_target}/macros", ":", - "~/.rpmmacros", NULL); -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); } #else macrofiles = MACROFILES; diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch index ae24b663aae..318f65ed375 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch @@ -1,4 +1,4 @@ -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 20 Jan 2017 13:32:06 +0200 Subject: [PATCH] Do not reset the PATH environment variable before running @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> lib/rpmscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/lib/rpmscript.c -=================================================================== ---- git.orig/lib/rpmscript.c -+++ git/lib/rpmscript.c -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar +diff --git a/lib/rpmscript.c b/lib/rpmscript.c +index 36e37cf77..37ada014c 100644 +--- a/lib/rpmscript.c ++++ b/lib/rpmscript.c +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, if (ipath && ipath[5] != '%') path = ipath; diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch deleted file mode 100644 index f9b809d1676..00000000000 --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 -From: Florian Festi <ffesti@redhat.com> -Date: Wed, 26 Jul 2023 15:01:35 +0200 -Subject: [PATCH] Duplicate filename before passing it to basename - -basename is allowed change the string passed to it. While we don't need -the filename after that just casting away the const seems a bit too -hacky. - -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tools/rpmuncompress.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c -index 58ddf5683..e13cc6a66 100644 ---- a/tools/rpmuncompress.c -+++ b/tools/rpmuncompress.c -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) - if (needtar) { - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); - } else if (at->compressed == COMPRESSED_GEM) { -- const char *bn = basename(fn); -+ char *tmp = xstrdup(fn); -+ const char *bn = basename(tmp); - size_t nvlen = strlen(bn) - 3; - char *gem = rpmGetPath("%{__gem}", NULL); - char *gemspec = NULL; -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) - - free(gemspec); - free(gem); -+ free(tmp); - } else { - rasprintf(&buf, "%s '%s'", zipper, fn); - } --- -2.43.0 - diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch deleted file mode 100644 index a93597a8352..00000000000 --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 -From: Calvin Buckley <calvin@cmpct.info> -Date: Tue, 11 Jul 2023 19:22:41 -0300 -Subject: [PATCH] Fix missing basename include on macOS - -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tools/rpmuncompress.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c -index bd4146d54..58ddf5683 100644 ---- a/tools/rpmuncompress.c -+++ b/tools/rpmuncompress.c -@@ -1,6 +1,7 @@ - #include "system.h" - - #include <popt.h> -+#include <libgen.h> - #include <errno.h> - #include <stdio.h> - #include <string.h> --- -2.43.0 - diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch new file mode 100644 index 00000000000..8e73e077049 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch @@ -0,0 +1,56 @@ +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen <pmatilai@redhat.com> +Date: Mon, 18 Dec 2023 12:25:04 +0200 +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag + +This regressed when we axed our internal glob copy in commit +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only +an optimization so we can just skip it if not available. + +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + CMakeLists.txt | 1 + + config.h.in | 1 + + rpmio/rpmglob.c | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d0ea565f3..0a474106e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) + set(HAVE_LIBDW 1) + endif() + ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) + if (NOT MAJOR_IN_SYSMACROS) + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) +diff --git a/config.h.in b/config.h.in +index cb97827d0..ab1757a9a 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -100,6 +100,7 @@ + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ + #cmakedefine RUNDIR @rundir@ +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c +index 8276eddb4..243568766 100644 +--- a/rpmio/rpmglob.c ++++ b/rpmio/rpmglob.c +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, + gflags |= GLOB_BRACE; + if (home != NULL && strlen(home) > 0) + gflags |= GLOB_TILDE; ++#if HAVE_GLOB_ONLYDIR + if (dir_only) + gflags |= GLOB_ONLYDIR; ++#endif + if (flags & RPMGLOB_NOCHECK) + gflags |= GLOB_NOCHECK; + diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch index bd3314a90f8..fc89b44132b 100644 --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch @@ -1,4 +1,4 @@ -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 17 Jan 2017 14:07:17 +0200 Subject: [PATCH] When cross-installing, execute package scriptlets without @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- lib/rpmscript.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -Index: git/lib/rpmscript.c -=================================================================== ---- git.orig/lib/rpmscript.c -+++ git/lib/rpmscript.c -@@ -18,7 +18,7 @@ - #include "rpmio/rpmio_internal.h" - - #include "lib/rpmplugins.h" /* rpm plugins hooks */ -- -+#include "lib/rpmchroot.h" /* rpmChrootOut */ - #include "debug.h" - - struct scriptNextFileFunc_s { -@@ -427,8 +427,7 @@ exit: +diff --git a/lib/rpmscript.c b/lib/rpmscript.c +index b18f851a3..36e37cf77 100644 +--- a/lib/rpmscript.c ++++ b/lib/rpmscript.c +@@ -448,8 +448,7 @@ exit: Fclose(out); /* XXX dup'd STDOUT_FILENO */ if (fn) { @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c free(fn); } free(mline); -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, if (rc != RPMRC_FAIL) { if (script_type & RPMSCRIPTLET_EXEC) { diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch index 64433abb6a1..5820b2e7e5b 100644 --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch @@ -1,4 +1,4 @@ -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Tue, 31 Aug 2021 10:37:05 +0200 Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex@linutronix.de> + --- build/pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/build/pack.c -=================================================================== ---- git.orig/build/pack.c -+++ git/build/pack.c -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) +diff --git a/build/pack.c b/build/pack.c +index f382c7da0..0889dd993 100644 +--- a/build/pack.c ++++ b/build/pack.c +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); buf = xstrdup(rpmio_flags); buf[s - rpmio_flags] = '\0'; diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch deleted file mode 100644 index 29b6686a940..00000000000 --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Thu, 4 Aug 2022 12:15:08 +0200 -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling - -x32 is a 64 bit x86 ABI with 32 bit pointers. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` - host_os_gnu=-gnux32 - fi -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` -+ host_os_gnu=-gnux32 -+fi - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then - host_os=`echo "${host_os}" | sed 's/-gnu$//'` - fi diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch index 82e6567dc74..8b9f1f72944 100644 --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch @@ -1,4 +1,4 @@ -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 7 May 2020 17:40:58 +0800 Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> Signed-off-by: Changqing Li <changqing.li@windriver.com> + --- lib/transaction.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -Index: git/lib/transaction.c -=================================================================== ---- git.orig/lib/transaction.c -+++ git/lib/transaction.c -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, +diff --git a/lib/transaction.c b/lib/transaction.c +index 70d2587ac..b89b30060 100644 +--- a/lib/transaction.c ++++ b/lib/transaction.c +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, rpmfsSetAction(ofs, ofx, FA_CREATE); rpmfsSetAction(fs, fx, FA_SKIPCOLOR); rConflicts = 0; diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch index a6c58699d36..388694d234f 100644 --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch @@ -1,4 +1,7 @@ -perl: disable auto requires +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 +From: Mark Hatle <mark.hatle@windriver.com> +Date: Tue, 15 Aug 2017 16:41:57 -0500 +Subject: [PATCH] perl: disable auto requires When generating automatic requirements, it's possible for perl scripts to declare 'optional' dependencies. These seem to often be incorrect and will @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Index: git/fileattrs/perl.attr -=================================================================== ---- git.orig/fileattrs/perl.attr -+++ git/fileattrs/perl.attr +--- + fileattrs/perl.attr | 2 +- + fileattrs/perllib.attr | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr +index 0daef58d5..81ddf5305 100644 +--- a/fileattrs/perl.attr ++++ b/fileattrs/perl.attr @@ -1,3 +1,3 @@ -%__perl_requires %{_rpmconfigdir}/perl.req +#__perl_requires %{_rpmconfigdir}/perl.req %__perl_magic ^.*[Pp]erl .*$ %__perl_flags exeonly -Index: git/fileattrs/perllib.attr -=================================================================== ---- git.orig/fileattrs/perllib.attr -+++ git/fileattrs/perllib.attr +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr +index fcad48099..495a28927 100644 +--- a/fileattrs/perllib.attr ++++ b/fileattrs/perllib.attr @@ -1,5 +1,5 @@ %__perllib_provides %{_rpmconfigdir}/perl.prov -%__perllib_requires %{_rpmconfigdir}/perl.req diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch deleted file mode 100644 index d0e637191a8..00000000000 --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 3 Mar 2023 09:54:48 -0800 -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash - -Fixes -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] -| hdr_hash, /* tp_hash */ -| ^~~~~~~~ - -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - python/header-py.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/header-py.c b/python/header-py.c -index 0aed0c9267..c15503f359 100644 ---- a/python/header-py.c -+++ b/python/header-py.c -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) - "(Oi)", s, RPMTAG_NEVR); - } - --static long hdr_hash(PyObject * h) -+static Py_hash_t hdr_hash(PyObject * h) - { -- return (long) h; -+ return (Py_hash_t) h; - } - - static PyObject * hdr_reduce(hdrObject *s) --- -2.39.2 - diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch index 2fe96a839c3..89c23f81975 100644 --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch @@ -1,7 +1,7 @@ -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 20 Jan 2017 13:33:05 +0200 -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR environment variable This is needed so that rpm can pick up target-specific configuration @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- lib/rpmrc.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) -Index: git/lib/rpmrc.c -=================================================================== ---- git.orig/lib/rpmrc.c -+++ git/lib/rpmrc.c -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const +diff --git a/lib/rpmrc.c b/lib/rpmrc.c +index f39dcfc11..f27f88753 100644 +--- a/lib/rpmrc.c ++++ b/lib/rpmrc.c +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, static void setDefaults(void) { const char *confdir = rpmConfigDir(); @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c + if (!defrcfiles) { defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", -- SYSCONFDIR "/rpmrc", ":"); -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); + confdir, "/" RPM_VENDOR "/rpmrc", ":", +- SYSCONFDIR "/rpmrc", NULL); ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); } #ifndef MACROFILES @@ -468,9 +472,9 @@ static void setDefaults(void) confdir, "/platform/%{_target}/macros", ":", confdir, "/fileattrs/*.attr", ":", - confdir, "/" RPMCANONVENDOR "/macros", ":", + confdir, "/" RPM_VENDOR "/macros", ":", - SYSCONFDIR "/rpm/macros.*", ":", - SYSCONFDIR "/rpm/macros", ":", -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", + etcconfdir, SYSCONFDIR "/rpm/macros", ":", -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); } #else macrofiles = MACROFILES; -@@ -997,7 +1001,11 @@ static void read_auxv(void) +@@ -1114,7 +1118,11 @@ static void read_auxv(void) */ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) { @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c static struct utsname un; char * chptr; canonEntry canon; -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) if (arch) *arch = un.machine; if (os) *os = un.sysname; diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch new file mode 100644 index 00000000000..e7f0adc70c9 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch @@ -0,0 +1,26 @@ +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Wed, 29 Nov 2023 14:09:06 +0100 +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html + +Building html would require doxygen-native. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> + +--- + docs/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index 52dce7b4e..c01ff7757 100644 +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) + endif() +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) + + install(FILES + README.md diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch new file mode 100644 index 00000000000..3d4b09bedb6 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch @@ -0,0 +1,34 @@ +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 16 Jan 2024 09:59:26 +0100 +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C + library + +This addresses musl failures; if there is code out there relying on +those braces, it needs to be fixed when used on musl. + +This is unlikely to be trivially fixable upstream. + +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + rpmio/rpmglob.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c +index 243568766..43c27074a 100644 +--- a/rpmio/rpmglob.c ++++ b/rpmio/rpmglob.c +@@ -33,6 +33,12 @@ + + #include "debug.h" + ++/* Don't fail if the standard C library +++ * doesn't provide brace expansion */ ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif ++ + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ + static int ismagic(const char *pattern) + { diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch index 9dbe7125ded..b3d57cc8703 100644 --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch @@ -1,4 +1,4 @@ -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 10 Jan 2019 18:14:18 +0100 Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- lib/rpmscript.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: git/lib/rpmscript.c -=================================================================== ---- git.orig/lib/rpmscript.c -+++ git/lib/rpmscript.c -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm +diff --git a/lib/rpmscript.c b/lib/rpmscript.c +index 37ada014c..bab0c97a6 100644 +--- a/lib/rpmscript.c ++++ b/lib/rpmscript.c +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) if (Ferror(fd)) goto exit; @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c static const char set_x[] = "set -x\n"; /* Assume failures will be caught by the write below */ Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, char *mline = NULL; rpmRC rc = RPMRC_FAIL; @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c if (script) { fn = writeScript(*argvp[0], script); -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, sname, strerror(errno)); goto exit; } else if (pid == 0) {/* Child */ @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c sname, *argvp[0], (unsigned)getpid()); fclose(in); -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, reaped = waitpid(pid, &status, 0); } while (reaped == -1 && errno == EINTR); diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch deleted file mode 100644 index 470dda1dcfb..00000000000 --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 -From: Panu Matilainen <pmatilai@redhat.com> -Date: Mon, 26 Jun 2023 12:45:09 +0300 -Subject: [PATCH] Don't muck with per-process global sqlite configuration from - the db backend - -sqlite3_config() affects all in-process uses of sqlite. librpm being a -low-level library, it has no business whatsoever making such decisions -for the applications running on top of it. Besides that, the callback can -easily end up pointing to an already closed database, causing an -innocent API user to crash in librpm on an entirely unrelated error on -some other database. "Oops." - -The sqlite API doesn't seem to provide any per-db or non-global context -for logging errors, thus we can only remove the call and let sqlite output -errors the way it pleases (print through stderr, presumably). - -Thanks to Jan Palus for spotting and reporting! - -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - lib/backend/sqlite.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c -index 5a029d575a..b612732267 100644 ---- a/lib/backend/sqlite.c -+++ b/lib/backend/sqlite.c -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) - sqlite3_result_int(sctx, match); - } - --static void errCb(void *data, int err, const char *msg) --{ -- rpmdb rdb = data; -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", -- rdb->db_descr, sqlite3_errstr(err), msg); --} -- - static int dbiCursorReset(dbiCursor dbc) - { - if (dbc->stmt) { -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) - * the "database is locked" errors at every cost - */ - sqlite3_busy_timeout(sdb, 10000); -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); - - sqlexec(sdb, "PRAGMA secure_delete = OFF"); - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch deleted file mode 100644 index e5c84ebd498..00000000000 --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 -From: Florian Festi <ffesti@redhat.com> -Date: Thu, 16 Mar 2023 19:05:04 +0100 -Subject: [PATCH] Fix compiler error on clang - -Turns out variable declarations are not allowed after a label, even in -C99. And while some compilers don't seem to care others do. - -Moving the declaration of mayopen to the start of the function to avoid -this problem. - -Resolves: #2435 -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - lib/fsm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lib/fsm.c b/lib/fsm.c -index 5671ac642d..183293edb0 100644 ---- a/lib/fsm.c -+++ b/lib/fsm.c -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; - int firstlinkfile = -1; -+ int mayopen = 0; - char *tid = NULL; - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); - struct filedata_s *firstlink = NULL; -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, - - setmeta: - /* Special files require path-based ops */ -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); - if (!rc && fd == -1 && mayopen) { - int flags = O_RDONLY; - /* Only follow safe symlinks, and never on temporary files */ diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb similarity index 72% rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb index 3e85cbb8efe..af11dec5ef3 100644 --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ - file://fix-declaration.patch \ - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ - file://0001-Fix-missing-basename-include-on-macOS.patch \ + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ " PE = "1" -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" S = "${WORKDIR}/git" -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" -inherit autotools gettext pkgconfig python3native -export PYTHON_ABI - -AUTOTOOLS_AUXDIR = "${S}/build-aux" - -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" - -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs # --localstatedir prevents rpm from writing its database to native sysroot when building images -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset -# plugins both behave badly inside builds. -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" + +inherit cmake gettext pkgconfig python3targetconfig +OECMAKE_GENERATOR = "Unix Makefiles" BBCLASSEXTEND = "native nativesdk" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" -# The inhibit plugin serves no purpose outside of the target -PACKAGECONFIG:remove:class-native = "inhibit" -PACKAGECONFIG:remove:class-nativesdk = "inhibit" +PACKAGECONFIG ??= "internal-openpgp" -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" -ASNEEDED = "" +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" + +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in # libmagic also has sysroot path contamination, so override it @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ ${libdir}/rpm/rpmdeps \ " -do_configure:prepend() { - mkdir -p ${S}/build-aux -} - do_install:append:class-native() { for tool in ${WRAPPER_TOOLS}; do test -x ${D}$tool && create_wrapper ${D}$tool \ @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { do_install:append () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${STAGING_DIR_NATIVE}/::g' \ ${D}/${libdir}/rpm/macros } @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ ${libdir}/rpm/check-* \ ${libdir}/rpm/sepdebugcrcfix \ ${libdir}/rpm/find-lang.sh \ + ${libdir}/rpm/sysusers.sh \ ${libdir}/rpm/*provides* \ ${libdir}/rpm/*requires* \ ${libdir}/rpm/*deps* \ -- 2.39.2 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-26 13:34 ` [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 Alexander Kanavin @ 2024-01-28 16:53 ` Khem Raj 2024-01-28 19:04 ` Alexander Kanavin [not found] ` <17AE983A55179990.23935@lists.openembedded.org> 2024-02-01 21:10 ` Alexandre Belloni 1 sibling, 2 replies; 20+ messages in thread From: Khem Raj @ 2024-01-28 16:53 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-core, Alexander Kanavin I am seeing some failures in meta-oe ( especially nodejs ) which I suspect are due to rpm upgrade and patches around it. https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > Upstream has replaced autoconf with cmake, which necessitates a rewrite of the > recipe and available options, and a rebase to cmake of > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : > the patch was removing the NULL marker at the end of function arguments, > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > was restoring it (in addition to the actual change the patch was making). > Now both patches preserve the NULL terminator. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > ...satisfiable-dependency-when-building.patch | 12 +-- > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > ...-PATH-environment-variable-before-ru.patch | 12 +-- > ...lename-before-passing-it-to-basename.patch | 40 ---------- > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > .../rpm/files/fix-declaration.patch | 39 ---------- > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- > 23 files changed, 328 insertions(+), 383 deletions(-) > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) > > diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > index 9fa486dfd3c..96fe57dfeb8 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > @@ -1,4 +1,4 @@ > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Thu, 9 Mar 2017 18:54:02 +0200 > Subject: [PATCH] Add a color setting for mips64_n32 binaries > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > 2 files changed, 6 insertions(+) > > diff --git a/build/rpmfc.c b/build/rpmfc.c > -index 26606378f..a16e3f4e9 100644 > +index 4b67a9bae..ed7e4e623 100644 > --- a/build/rpmfc.c > +++ b/build/rpmfc.c > -@@ -646,6 +646,7 @@ exit: > +@@ -660,6 +660,7 @@ exit: > static const struct rpmfcTokens_s rpmfcTokens[] = { > { "directory", RPMFC_INCLUDE }, > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > color = RPMFC_ELF32; > break; > } > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > if (elf) > elf_end(elf); > diff --git a/rpmrc.in b/rpmrc.in > -index 2975a3a0e..c7232b48b 100644 > +index 8646a966b..7349fdfd3 100644 > --- a/rpmrc.in > +++ b/rpmrc.in > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > archcolor: mips64r6 2 > archcolor: mips64r6el 2 > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > new file mode 100644 > index 00000000000..5053caae33f > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > @@ -0,0 +1,28 @@ > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than > + cmake modules > + > +Otherwise cmake will try to find libm, badly, and fail. > + > +Upstream-Status: Inappropriate [oe-core specific] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > + > +--- > + CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 7f0630453..d0ea565f3 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -187,7 +187,7 @@ set(REQFUNCS > + ) > + > + find_package(PkgConfig REQUIRED) > +-find_package(Lua 5.2 REQUIRED) > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > + find_package(ZLIB REQUIRED) > + find_package(BZip2) > + find_package(Iconv) > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > new file mode 100644 > index 00000000000..db83b176b41 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > @@ -0,0 +1,42 @@ > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit > + option > + > +This was lost in autotools -> cmake transition. The particular > +reason to make it explicit is that readline is gpl version 3 > +licensed, and in some builds components under that license > +need to be excluded. > + > +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > +--- > + CMakeLists.txt | 7 ++++++- > + 1 file changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 0a474106e..89e27417f 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) > + option(WITH_FSVERITY "Build with fsverity support" OFF) > + option(WITH_IMAEVM "Build with IMA support" OFF) > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > ++option(WITH_READLINE "Build with readline support" ON) > + > + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > +@@ -193,7 +194,11 @@ find_package(BZip2) > + find_package(Iconv) > + > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > ++ > ++if (WITH_READLINE) > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) > ++endif() > ++ > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > index 8440c3516d6..df5543873c1 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > @@ -1,4 +1,4 @@ > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Mon, 9 Jan 2017 18:52:11 +0200 > Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > build/pack.c | 4 ---- > 1 file changed, 4 deletions(-) > > -Index: git/build/pack.c > -=================================================================== > ---- git.orig/build/pack.c > -+++ git/build/pack.c > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > +diff --git a/build/pack.c b/build/pack.c > +index f7dac6d9a..f382c7da0 100644 > +--- a/build/pack.c > ++++ b/build/pack.c > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); > } > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > index 8fdc5edb10b..b056d19741a 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > @@ -1,4 +1,4 @@ > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Mon, 27 Feb 2017 09:43:30 +0200 > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for > @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > --- > - configure.ac | 2 +- > - macros.in | 2 +- > - rpm.am | 4 ++-- > - 3 files changed, 4 insertions(+), 4 deletions(-) > + CMakeLists.txt | 2 +- > + macros.in | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > > -diff --git a/configure.ac b/configure.ac > -index e6676c581..ec28db9b6 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -942,7 +942,7 @@ else > - usrprefix=$prefix > - fi > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 2767915fb..7f0630453 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) > + option(WITH_IMAEVM "Build with IMA support" OFF) > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > - AC_SUBST(RPMCONFIGDIR) > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") > ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > - AC_SUBST(OBJDUMP) > + # Emulate libtool versioning. Before a public release: > diff --git a/macros.in b/macros.in > -index a2411d784..735b74d99 100644 > +index b49ffaad4..3acbe78f6 100644 > --- a/macros.in > +++ b/macros.in > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ > %_sharedstatedir %{_prefix}/com > %_localstatedir %{_prefix}/var > %_lib lib > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > %_includedir %{_prefix}/include > %_infodir %{_datadir}/info > %_mandir %{_datadir}/man > -diff --git a/rpm.am b/rpm.am > -index 55b5b3935..5a51f102b 100644 > ---- a/rpm.am > -+++ b/rpm.am > -@@ -1,10 +1,10 @@ > - # Internal binaries > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm > --rpmlibexecdir = $(prefix)/lib/rpm > -+rpmlibexecdir = $(libdir)/rpm > - > - # Host independent config files > - ## HACK: it probably should be $(datadir)/rpm > --rpmconfigdir = $(prefix)/lib/rpm > -+rpmconfigdir = $(libdir)/rpm > - > - # Libtool version (current-revision-age) for all our libraries > - rpm_version_info = 13:0:4 > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > index fda64eefe01..6a18679da2f 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > @@ -1,35 +1,36 @@ > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Tue, 10 Jan 2017 14:11:30 +0200 > Subject: [PATCH] Do not read config files from $HOME > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmrc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > -Index: git/lib/rpmrc.c > -=================================================================== > ---- git.orig/lib/rpmrc.c > -+++ git/lib/rpmrc.c > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > +index 269d490ac..f39dcfc11 100644 > +--- a/lib/rpmrc.c > ++++ b/lib/rpmrc.c > @@ -458,8 +458,7 @@ static void setDefaults(void) > if (!defrcfiles) { > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > - SYSCONFDIR "/rpmrc", ":", > - "~/.rpmrc", NULL); > -+ SYSCONFDIR "/rpmrc", ":"); > ++ SYSCONFDIR "/rpmrc", NULL); > } > > #ifndef MACROFILES > @@ -471,8 +470,7 @@ static void setDefaults(void) > - confdir, "/" RPMCANONVENDOR "/macros", ":", > + confdir, "/" RPM_VENDOR "/macros", ":", > SYSCONFDIR "/rpm/macros.*", ":", > SYSCONFDIR "/rpm/macros", ":", > - SYSCONFDIR "/rpm/%{_target}/macros", ":", > - "~/.rpmmacros", NULL); > -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); > ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); > } > #else > macrofiles = MACROFILES; > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > index ae24b663aae..318f65ed375 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > @@ -1,4 +1,4 @@ > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Fri, 20 Jan 2017 13:32:06 +0200 > Subject: [PATCH] Do not reset the PATH environment variable before running > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > lib/rpmscript.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -Index: git/lib/rpmscript.c > -=================================================================== > ---- git.orig/lib/rpmscript.c > -+++ git/lib/rpmscript.c > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > +index 36e37cf77..37ada014c 100644 > +--- a/lib/rpmscript.c > ++++ b/lib/rpmscript.c > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, > if (ipath && ipath[5] != '%') > path = ipath; > > diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > deleted file mode 100644 > index f9b809d1676..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > +++ /dev/null > @@ -1,40 +0,0 @@ > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 > -From: Florian Festi <ffesti@redhat.com> > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > -Subject: [PATCH] Duplicate filename before passing it to basename > - > -basename is allowed change the string passed to it. While we don't need > -the filename after that just casting away the const seems a bit too > -hacky. > - > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - tools/rpmuncompress.c | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > -index 58ddf5683..e13cc6a66 100644 > ---- a/tools/rpmuncompress.c > -+++ b/tools/rpmuncompress.c > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > - if (needtar) { > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); > - } else if (at->compressed == COMPRESSED_GEM) { > -- const char *bn = basename(fn); > -+ char *tmp = xstrdup(fn); > -+ const char *bn = basename(tmp); > - size_t nvlen = strlen(bn) - 3; > - char *gem = rpmGetPath("%{__gem}", NULL); > - char *gemspec = NULL; > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > - > - free(gemspec); > - free(gem); > -+ free(tmp); > - } else { > - rasprintf(&buf, "%s '%s'", zipper, fn); > - } > --- > -2.43.0 > - > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > deleted file mode 100644 > index a93597a8352..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 > -From: Calvin Buckley <calvin@cmpct.info> > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > -Subject: [PATCH] Fix missing basename include on macOS > - > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - tools/rpmuncompress.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > -index bd4146d54..58ddf5683 100644 > ---- a/tools/rpmuncompress.c > -+++ b/tools/rpmuncompress.c > -@@ -1,6 +1,7 @@ > - #include "system.h" > - > - #include <popt.h> > -+#include <libgen.h> > - #include <errno.h> > - #include <stdio.h> > - #include <string.h> > --- > -2.43.0 > - > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > new file mode 100644 > index 00000000000..8e73e077049 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > @@ -0,0 +1,56 @@ > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 > +From: Panu Matilainen <pmatilai@redhat.com> > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag > + > +This regressed when we axed our internal glob copy in commit > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only > +an optimization so we can just skip it if not available. > + > +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > +--- > + CMakeLists.txt | 1 + > + config.h.in | 1 + > + rpmio/rpmglob.c | 2 ++ > + 3 files changed, 4 insertions(+) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index d0ea565f3..0a474106e 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > + set(HAVE_LIBDW 1) > + endif() > + > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > + if (NOT MAJOR_IN_SYSMACROS) > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > +diff --git a/config.h.in b/config.h.in > +index cb97827d0..ab1757a9a 100644 > +--- a/config.h.in > ++++ b/config.h.in > +@@ -100,6 +100,7 @@ > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > + #cmakedefine RUNDIR @rundir@ > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > +index 8276eddb4..243568766 100644 > +--- a/rpmio/rpmglob.c > ++++ b/rpmio/rpmglob.c > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, > + gflags |= GLOB_BRACE; > + if (home != NULL && strlen(home) > 0) > + gflags |= GLOB_TILDE; > ++#if HAVE_GLOB_ONLYDIR > + if (dir_only) > + gflags |= GLOB_ONLYDIR; > ++#endif > + if (flags & RPMGLOB_NOCHECK) > + gflags |= GLOB_NOCHECK; > + > diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > index bd3314a90f8..fc89b44132b 100644 > --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > @@ -1,4 +1,4 @@ > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Tue, 17 Jan 2017 14:07:17 +0200 > Subject: [PATCH] When cross-installing, execute package scriptlets without > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmscript.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > -Index: git/lib/rpmscript.c > -=================================================================== > ---- git.orig/lib/rpmscript.c > -+++ git/lib/rpmscript.c > -@@ -18,7 +18,7 @@ > - #include "rpmio/rpmio_internal.h" > - > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > -- > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > - #include "debug.h" > - > - struct scriptNextFileFunc_s { > -@@ -427,8 +427,7 @@ exit: > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > +index b18f851a3..36e37cf77 100644 > +--- a/lib/rpmscript.c > ++++ b/lib/rpmscript.c > +@@ -448,8 +448,7 @@ exit: > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > > if (fn) { > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > free(fn); > } > free(mline); > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, > > if (rc != RPMRC_FAIL) { > if (script_type & RPMSCRIPTLET_EXEC) { > diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > index 64433abb6a1..5820b2e7e5b 100644 > --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > @@ -1,4 +1,4 @@ > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex@linutronix.de> > Date: Tue, 31 Aug 2021 10:37:05 +0200 > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > + > --- > build/pack.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -Index: git/build/pack.c > -=================================================================== > ---- git.orig/build/pack.c > -+++ git/build/pack.c > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > +diff --git a/build/pack.c b/build/pack.c > +index f382c7da0..0889dd993 100644 > +--- a/build/pack.c > ++++ b/build/pack.c > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); > buf = xstrdup(rpmio_flags); > buf[s - rpmio_flags] = '\0'; > diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > deleted file mode 100644 > index 29b6686a940..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex@linutronix.de> > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling > - > -x32 is a 64 bit x86 ABI with 32 bit pointers. > - > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - configure.ac | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -Index: git/configure.ac > -=================================================================== > ---- git.orig/configure.ac > -+++ git/configure.ac > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > - host_os_gnu=-gnux32 > - fi > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > -+ host_os_gnu=-gnux32 > -+fi > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > - fi > diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > index 82e6567dc74..8b9f1f72944 100644 > --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > @@ -1,4 +1,4 @@ > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 > From: Changqing Li <changqing.li@windriver.com> > Date: Thu, 7 May 2020 17:40:58 +0800 > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". > Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > + > --- > lib/transaction.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > -Index: git/lib/transaction.c > -=================================================================== > ---- git.orig/lib/transaction.c > -+++ git/lib/transaction.c > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > +diff --git a/lib/transaction.c b/lib/transaction.c > +index 70d2587ac..b89b30060 100644 > +--- a/lib/transaction.c > ++++ b/lib/transaction.c > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > rpmfsSetAction(ofs, ofx, FA_CREATE); > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > rConflicts = 0; > diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > index a6c58699d36..388694d234f 100644 > --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > @@ -1,4 +1,7 @@ > -perl: disable auto requires > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 > +From: Mark Hatle <mark.hatle@windriver.com> > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > +Subject: [PATCH] perl: disable auto requires > > When generating automatic requirements, it's possible for perl scripts to > declare 'optional' dependencies. These seem to often be incorrect and will > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > -Index: git/fileattrs/perl.attr > -=================================================================== > ---- git.orig/fileattrs/perl.attr > -+++ git/fileattrs/perl.attr > +--- > + fileattrs/perl.attr | 2 +- > + fileattrs/perllib.attr | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > +index 0daef58d5..81ddf5305 100644 > +--- a/fileattrs/perl.attr > ++++ b/fileattrs/perl.attr > @@ -1,3 +1,3 @@ > -%__perl_requires %{_rpmconfigdir}/perl.req > +#__perl_requires %{_rpmconfigdir}/perl.req > %__perl_magic ^.*[Pp]erl .*$ > %__perl_flags exeonly > -Index: git/fileattrs/perllib.attr > -=================================================================== > ---- git.orig/fileattrs/perllib.attr > -+++ git/fileattrs/perllib.attr > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > +index fcad48099..495a28927 100644 > +--- a/fileattrs/perllib.attr > ++++ b/fileattrs/perllib.attr > @@ -1,5 +1,5 @@ > %__perllib_provides %{_rpmconfigdir}/perl.prov > -%__perllib_requires %{_rpmconfigdir}/perl.req > diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > deleted file mode 100644 > index d0e637191a8..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash > - > -Fixes > -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] > -| hdr_hash, /* tp_hash */ > -| ^~~~~~~~ > - > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - python/header-py.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/python/header-py.c b/python/header-py.c > -index 0aed0c9267..c15503f359 100644 > ---- a/python/header-py.c > -+++ b/python/header-py.c > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) > - "(Oi)", s, RPMTAG_NEVR); > - } > - > --static long hdr_hash(PyObject * h) > -+static Py_hash_t hdr_hash(PyObject * h) > - { > -- return (long) h; > -+ return (Py_hash_t) h; > - } > - > - static PyObject * hdr_reduce(hdrObject *s) > --- > -2.39.2 > - > diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > index 2fe96a839c3..89c23f81975 100644 > --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > @@ -1,7 +1,7 @@ > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Fri, 20 Jan 2017 13:33:05 +0200 > -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR > +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR > environment variable > > This is needed so that rpm can pick up target-specific configuration > @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmrc.c | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > -Index: git/lib/rpmrc.c > -=================================================================== > ---- git.orig/lib/rpmrc.c > -+++ git/lib/rpmrc.c > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > +index f39dcfc11..f27f88753 100644 > +--- a/lib/rpmrc.c > ++++ b/lib/rpmrc.c > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, > static void setDefaults(void) > { > const char *confdir = rpmConfigDir(); > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > + > if (!defrcfiles) { > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > -- SYSCONFDIR "/rpmrc", ":"); > -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > +- SYSCONFDIR "/rpmrc", NULL); > ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); > } > > #ifndef MACROFILES > @@ -468,9 +472,9 @@ static void setDefaults(void) > confdir, "/platform/%{_target}/macros", ":", > confdir, "/fileattrs/*.attr", ":", > - confdir, "/" RPMCANONVENDOR "/macros", ":", > + confdir, "/" RPM_VENDOR "/macros", ":", > - SYSCONFDIR "/rpm/macros.*", ":", > - SYSCONFDIR "/rpm/macros", ":", > -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); > +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); > + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", > + etcconfdir, SYSCONFDIR "/rpm/macros", ":", > -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); > ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); > } > #else > macrofiles = MACROFILES; > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > */ > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > { > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > static struct utsname un; > char * chptr; > canonEntry canon; > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > if (arch) *arch = un.machine; > if (os) *os = un.sysname; > diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > new file mode 100644 > index 00000000000..e7f0adc70c9 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > @@ -0,0 +1,26 @@ > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html > + > +Building html would require doxygen-native. > + > +Upstream-Status: Inappropriate [oe-core specific] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > + > +--- > + docs/CMakeLists.txt | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > +index 52dce7b4e..c01ff7757 100644 > +--- a/docs/CMakeLists.txt > ++++ b/docs/CMakeLists.txt > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > + endif() > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) > + > + install(FILES > + README.md > diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > new file mode 100644 > index 00000000000..3d4b09bedb6 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > @@ -0,0 +1,34 @@ > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C > + library > + > +This addresses musl failures; if there is code out there relying on > +those braces, it needs to be fixed when used on musl. > + > +This is unlikely to be trivially fixable upstream. > + > +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > +--- > + rpmio/rpmglob.c | 6 ++++++ > + 1 file changed, 6 insertions(+) > + > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > +index 243568766..43c27074a 100644 > +--- a/rpmio/rpmglob.c > ++++ b/rpmio/rpmglob.c > +@@ -33,6 +33,12 @@ > + > + #include "debug.h" > + > ++/* Don't fail if the standard C library > +++ * doesn't provide brace expansion */ > ++#ifndef GLOB_BRACE > ++#define GLOB_BRACE 0 > ++#endif > ++ > + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ > + static int ismagic(const char *pattern) > + { > diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > index 9dbe7125ded..b3d57cc8703 100644 > --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > @@ -1,4 +1,4 @@ > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Thu, 10 Jan 2019 18:14:18 +0100 > Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmscript.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > -Index: git/lib/rpmscript.c > -=================================================================== > ---- git.orig/lib/rpmscript.c > -+++ git/lib/rpmscript.c > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > +index 37ada014c..bab0c97a6 100644 > +--- a/lib/rpmscript.c > ++++ b/lib/rpmscript.c > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) > if (Ferror(fd)) > goto exit; > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > static const char set_x[] = "set -x\n"; > /* Assume failures will be caught by the write below */ > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > char *mline = NULL; > rpmRC rc = RPMRC_FAIL; > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > > if (script) { > fn = writeScript(*argvp[0], script); > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > sname, strerror(errno)); > goto exit; > } else if (pid == 0) {/* Child */ > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > sname, *argvp[0], (unsigned)getpid()); > > fclose(in); > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > reaped = waitpid(pid, &status, 0); > } while (reaped == -1 && errno == EINTR); > > diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > deleted file mode 100644 > index 470dda1dcfb..00000000000 > --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > +++ /dev/null > @@ -1,51 +0,0 @@ > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 > -From: Panu Matilainen <pmatilai@redhat.com> > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > -Subject: [PATCH] Don't muck with per-process global sqlite configuration from > - the db backend > - > -sqlite3_config() affects all in-process uses of sqlite. librpm being a > -low-level library, it has no business whatsoever making such decisions > -for the applications running on top of it. Besides that, the callback can > -easily end up pointing to an already closed database, causing an > -innocent API user to crash in librpm on an entirely unrelated error on > -some other database. "Oops." > - > -The sqlite API doesn't seem to provide any per-db or non-global context > -for logging errors, thus we can only remove the call and let sqlite output > -errors the way it pleases (print through stderr, presumably). > - > -Thanks to Jan Palus for spotting and reporting! > - > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > ---- > - lib/backend/sqlite.c | 8 -------- > - 1 file changed, 8 deletions(-) > - > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > -index 5a029d575a..b612732267 100644 > ---- a/lib/backend/sqlite.c > -+++ b/lib/backend/sqlite.c > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) > - sqlite3_result_int(sctx, match); > - } > - > --static void errCb(void *data, int err, const char *msg) > --{ > -- rpmdb rdb = data; > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > -- rdb->db_descr, sqlite3_errstr(err), msg); > --} > -- > - static int dbiCursorReset(dbiCursor dbc) > - { > - if (dbc->stmt) { > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) > - * the "database is locked" errors at every cost > - */ > - sqlite3_busy_timeout(sdb, 10000); > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > - > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch > deleted file mode 100644 > index e5c84ebd498..00000000000 > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 > -From: Florian Festi <ffesti@redhat.com> > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > -Subject: [PATCH] Fix compiler error on clang > - > -Turns out variable declarations are not allowed after a label, even in > -C99. And while some compilers don't seem to care others do. > - > -Moving the declaration of mayopen to the start of the function to avoid > -this problem. > - > -Resolves: #2435 > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - lib/fsm.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/lib/fsm.c b/lib/fsm.c > -index 5671ac642d..183293edb0 100644 > ---- a/lib/fsm.c > -+++ b/lib/fsm.c > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; > - int firstlinkfile = -1; > -+ int mayopen = 0; > - char *tid = NULL; > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > - struct filedata_s *firstlink = NULL; > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > - > - setmeta: > - /* Special files require path-based ops */ > -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > - if (!rc && fd == -1 && mayopen) { > - int flags = O_RDONLY; > - /* Only follow safe symlinks, and never on temporary files */ > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > similarity index 72% > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > index 3e85cbb8efe..af11dec5ef3 100644 > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > > -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > - file://fix-declaration.patch \ > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ > - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > - file://0001-Fix-missing-basename-include-on-macOS.patch \ > + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > " > > PE = "1" > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > > S = "${WORKDIR}/git" > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" > DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" > > -inherit autotools gettext pkgconfig python3native > -export PYTHON_ABI > - > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > - > -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > - > -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" > > # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs > # --localstatedir prevents rpm from writing its database to native sysroot when building images > -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset > -# plugins both behave badly inside builds. > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" > +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > + > +inherit cmake gettext pkgconfig python3targetconfig > +OECMAKE_GENERATOR = "Unix Makefiles" > > BBCLASSEXTEND = "native nativesdk" > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" > -# The inhibit plugin serves no purpose outside of the target > -PACKAGECONFIG:remove:class-native = "inhibit" > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > +PACKAGECONFIG ??= "internal-openpgp" > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" > -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > > -ASNEEDED = "" > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > + > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > > # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in > # libmagic also has sysroot path contamination, so override it > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > ${libdir}/rpm/rpmdeps \ > " > > -do_configure:prepend() { > - mkdir -p ${S}/build-aux > -} > - > do_install:append:class-native() { > for tool in ${WRAPPER_TOOLS}; do > test -x ${D}$tool && create_wrapper ${D}$tool \ > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > > do_install:append () { > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > ${D}/${libdir}/rpm/macros > > } > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > ${libdir}/rpm/check-* \ > ${libdir}/rpm/sepdebugcrcfix \ > ${libdir}/rpm/find-lang.sh \ > + ${libdir}/rpm/sysusers.sh \ > ${libdir}/rpm/*provides* \ > ${libdir}/rpm/*requires* \ > ${libdir}/rpm/*deps* \ > -- > 2.39.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#194368): https://lists.openembedded.org/g/openembedded-core/message/194368 > Mute This Topic: https://lists.openembedded.org/mt/103975822/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-28 16:53 ` [OE-core] " Khem Raj @ 2024-01-28 19:04 ` Alexander Kanavin [not found] ` <17AE983A55179990.23935@lists.openembedded.org> 1 sibling, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-28 19:04 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core, Alexander Kanavin 0257: file = file.replace("%", "%%%%%%%%") *** 0258: attr = get_attr(file) ... *** 0203: stat_f = os.stat(rootpath + "/" + path, follow_symlinks=False) Exception: FileNotFoundError: [Errno 2] No such file or directory: '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/nodejs/20.8.1/packages-split/nodejs-ptest/usr/lib/nodejs/ptest/test/fixtures/es-modules/test-esm-double-encoding-native%%%%%%%%20.mjs' Seems like 257 and 258 should be swapped. No idea what that % replacement is for. Alex On Sun, 28 Jan 2024 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: > > I am seeing some failures in meta-oe ( especially nodejs ) which I > suspect are due to rpm upgrade and patches around it. > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio > > On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin > <alex.kanavin@gmail.com> wrote: > > > > Upstream has replaced autoconf with cmake, which necessitates a rewrite of the > > recipe and available options, and a rebase to cmake of > > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : > > the patch was removing the NULL marker at the end of function arguments, > > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > was restoring it (in addition to the actual change the patch was making). > > Now both patches preserve the NULL terminator. > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > --- > > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > > ...satisfiable-dependency-when-building.patch | 12 +-- > > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > > ...-PATH-environment-variable-before-ru.patch | 12 +-- > > ...lename-before-passing-it-to-basename.patch | 40 ---------- > > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > > .../rpm/files/fix-declaration.patch | 39 ---------- > > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- > > 23 files changed, 328 insertions(+), 383 deletions(-) > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch > > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > index 9fa486dfd3c..96fe57dfeb8 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > @@ -1,4 +1,4 @@ > > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 > > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Thu, 9 Mar 2017 18:54:02 +0200 > > Subject: [PATCH] Add a color setting for mips64_n32 binaries > > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > 2 files changed, 6 insertions(+) > > > > diff --git a/build/rpmfc.c b/build/rpmfc.c > > -index 26606378f..a16e3f4e9 100644 > > +index 4b67a9bae..ed7e4e623 100644 > > --- a/build/rpmfc.c > > +++ b/build/rpmfc.c > > -@@ -646,6 +646,7 @@ exit: > > +@@ -660,6 +660,7 @@ exit: > > static const struct rpmfcTokens_s rpmfcTokens[] = { > > { "directory", RPMFC_INCLUDE }, > > > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > > > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > > color = RPMFC_ELF32; > > break; > > } > > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > > if (elf) > > elf_end(elf); > > diff --git a/rpmrc.in b/rpmrc.in > > -index 2975a3a0e..c7232b48b 100644 > > +index 8646a966b..7349fdfd3 100644 > > --- a/rpmrc.in > > +++ b/rpmrc.in > > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > > archcolor: mips64r6 2 > > archcolor: mips64r6el 2 > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > new file mode 100644 > > index 00000000000..5053caae33f > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > @@ -0,0 +1,28 @@ > > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than > > + cmake modules > > + > > +Otherwise cmake will try to find libm, badly, and fail. > > + > > +Upstream-Status: Inappropriate [oe-core specific] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > + > > +--- > > + CMakeLists.txt | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 7f0630453..d0ea565f3 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -187,7 +187,7 @@ set(REQFUNCS > > + ) > > + > > + find_package(PkgConfig REQUIRED) > > +-find_package(Lua 5.2 REQUIRED) > > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > > + find_package(ZLIB REQUIRED) > > + find_package(BZip2) > > + find_package(Iconv) > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > new file mode 100644 > > index 00000000000..db83b176b41 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > @@ -0,0 +1,42 @@ > > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > > +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit > > + option > > + > > +This was lost in autotools -> cmake transition. The particular > > +reason to make it explicit is that readline is gpl version 3 > > +licensed, and in some builds components under that license > > +need to be excluded. > > + > > +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > +--- > > + CMakeLists.txt | 7 ++++++- > > + 1 file changed, 6 insertions(+), 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 0a474106e..89e27417f 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) > > + option(WITH_FSVERITY "Build with fsverity support" OFF) > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > ++option(WITH_READLINE "Build with readline support" ON) > > + > > + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > +@@ -193,7 +194,11 @@ find_package(BZip2) > > + find_package(Iconv) > > + > > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > > ++ > > ++if (WITH_READLINE) > > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) > > ++endif() > > ++ > > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > index 8440c3516d6..df5543873c1 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > @@ -1,4 +1,4 @@ > > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 > > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Mon, 9 Jan 2017 18:52:11 +0200 > > Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in > > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > build/pack.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > -Index: git/build/pack.c > > -=================================================================== > > ---- git.orig/build/pack.c > > -+++ git/build/pack.c > > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > > +diff --git a/build/pack.c b/build/pack.c > > +index f7dac6d9a..f382c7da0 100644 > > +--- a/build/pack.c > > ++++ b/build/pack.c > > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch > > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); > > } > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > index 8fdc5edb10b..b056d19741a 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > @@ -1,4 +1,4 @@ > > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 > > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Mon, 27 Feb 2017 09:43:30 +0200 > > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for > > @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > --- > > - configure.ac | 2 +- > > - macros.in | 2 +- > > - rpm.am | 4 ++-- > > - 3 files changed, 4 insertions(+), 4 deletions(-) > > + CMakeLists.txt | 2 +- > > + macros.in | 2 +- > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > > -diff --git a/configure.ac b/configure.ac > > -index e6676c581..ec28db9b6 100644 > > ---- a/configure.ac > > -+++ b/configure.ac > > -@@ -942,7 +942,7 @@ else > > - usrprefix=$prefix > > - fi > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 2767915fb..7f0630453 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > > - AC_SUBST(RPMCONFIGDIR) > > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") > > ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > > - AC_SUBST(OBJDUMP) > > + # Emulate libtool versioning. Before a public release: > > diff --git a/macros.in b/macros.in > > -index a2411d784..735b74d99 100644 > > +index b49ffaad4..3acbe78f6 100644 > > --- a/macros.in > > +++ b/macros.in > > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ > > %_sharedstatedir %{_prefix}/com > > %_localstatedir %{_prefix}/var > > %_lib lib > > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > > %_includedir %{_prefix}/include > > %_infodir %{_datadir}/info > > %_mandir %{_datadir}/man > > -diff --git a/rpm.am b/rpm.am > > -index 55b5b3935..5a51f102b 100644 > > ---- a/rpm.am > > -+++ b/rpm.am > > -@@ -1,10 +1,10 @@ > > - # Internal binaries > > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm > > --rpmlibexecdir = $(prefix)/lib/rpm > > -+rpmlibexecdir = $(libdir)/rpm > > - > > - # Host independent config files > > - ## HACK: it probably should be $(datadir)/rpm > > --rpmconfigdir = $(prefix)/lib/rpm > > -+rpmconfigdir = $(libdir)/rpm > > - > > - # Libtool version (current-revision-age) for all our libraries > > - rpm_version_info = 13:0:4 > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > index fda64eefe01..6a18679da2f 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > @@ -1,35 +1,36 @@ > > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 > > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Tue, 10 Jan 2017 14:11:30 +0200 > > Subject: [PATCH] Do not read config files from $HOME > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmrc.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > -Index: git/lib/rpmrc.c > > -=================================================================== > > ---- git.orig/lib/rpmrc.c > > -+++ git/lib/rpmrc.c > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > +index 269d490ac..f39dcfc11 100644 > > +--- a/lib/rpmrc.c > > ++++ b/lib/rpmrc.c > > @@ -458,8 +458,7 @@ static void setDefaults(void) > > if (!defrcfiles) { > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > - SYSCONFDIR "/rpmrc", ":", > > - "~/.rpmrc", NULL); > > -+ SYSCONFDIR "/rpmrc", ":"); > > ++ SYSCONFDIR "/rpmrc", NULL); > > } > > > > #ifndef MACROFILES > > @@ -471,8 +470,7 @@ static void setDefaults(void) > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > + confdir, "/" RPM_VENDOR "/macros", ":", > > SYSCONFDIR "/rpm/macros.*", ":", > > SYSCONFDIR "/rpm/macros", ":", > > - SYSCONFDIR "/rpm/%{_target}/macros", ":", > > - "~/.rpmmacros", NULL); > > -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > } > > #else > > macrofiles = MACROFILES; > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > index ae24b663aae..318f65ed375 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > @@ -1,4 +1,4 @@ > > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 > > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Fri, 20 Jan 2017 13:32:06 +0200 > > Subject: [PATCH] Do not reset the PATH environment variable before running > > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > lib/rpmscript.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > -Index: git/lib/rpmscript.c > > -=================================================================== > > ---- git.orig/lib/rpmscript.c > > -+++ git/lib/rpmscript.c > > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > +index 36e37cf77..37ada014c 100644 > > +--- a/lib/rpmscript.c > > ++++ b/lib/rpmscript.c > > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, > > if (ipath && ipath[5] != '%') > > path = ipath; > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > deleted file mode 100644 > > index f9b809d1676..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 > > -From: Florian Festi <ffesti@redhat.com> > > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > > -Subject: [PATCH] Duplicate filename before passing it to basename > > - > > -basename is allowed change the string passed to it. While we don't need > > -the filename after that just casting away the const seems a bit too > > -hacky. > > - > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - tools/rpmuncompress.c | 4 +++- > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > - > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > -index 58ddf5683..e13cc6a66 100644 > > ---- a/tools/rpmuncompress.c > > -+++ b/tools/rpmuncompress.c > > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > > - if (needtar) { > > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); > > - } else if (at->compressed == COMPRESSED_GEM) { > > -- const char *bn = basename(fn); > > -+ char *tmp = xstrdup(fn); > > -+ const char *bn = basename(tmp); > > - size_t nvlen = strlen(bn) - 3; > > - char *gem = rpmGetPath("%{__gem}", NULL); > > - char *gemspec = NULL; > > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > > - > > - free(gemspec); > > - free(gem); > > -+ free(tmp); > > - } else { > > - rasprintf(&buf, "%s '%s'", zipper, fn); > > - } > > --- > > -2.43.0 > > - > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > deleted file mode 100644 > > index a93597a8352..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > +++ /dev/null > > @@ -1,26 +0,0 @@ > > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 > > -From: Calvin Buckley <calvin@cmpct.info> > > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > > -Subject: [PATCH] Fix missing basename include on macOS > > - > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - tools/rpmuncompress.c | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > -index bd4146d54..58ddf5683 100644 > > ---- a/tools/rpmuncompress.c > > -+++ b/tools/rpmuncompress.c > > -@@ -1,6 +1,7 @@ > > - #include "system.h" > > - > > - #include <popt.h> > > -+#include <libgen.h> > > - #include <errno.h> > > - #include <stdio.h> > > - #include <string.h> > > --- > > -2.43.0 > > - > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > new file mode 100644 > > index 00000000000..8e73e077049 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > @@ -0,0 +1,56 @@ > > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 > > +From: Panu Matilainen <pmatilai@redhat.com> > > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > > +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag > > + > > +This regressed when we axed our internal glob copy in commit > > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only > > +an optimization so we can just skip it if not available. > > + > > +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > +--- > > + CMakeLists.txt | 1 + > > + config.h.in | 1 + > > + rpmio/rpmglob.c | 2 ++ > > + 3 files changed, 4 insertions(+) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index d0ea565f3..0a474106e 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > > + set(HAVE_LIBDW 1) > > + endif() > > + > > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > > + if (NOT MAJOR_IN_SYSMACROS) > > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > > +diff --git a/config.h.in b/config.h.in > > +index cb97827d0..ab1757a9a 100644 > > +--- a/config.h.in > > ++++ b/config.h.in > > +@@ -100,6 +100,7 @@ > > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > > + #cmakedefine RUNDIR @rundir@ > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > +index 8276eddb4..243568766 100644 > > +--- a/rpmio/rpmglob.c > > ++++ b/rpmio/rpmglob.c > > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, > > + gflags |= GLOB_BRACE; > > + if (home != NULL && strlen(home) > 0) > > + gflags |= GLOB_TILDE; > > ++#if HAVE_GLOB_ONLYDIR > > + if (dir_only) > > + gflags |= GLOB_ONLYDIR; > > ++#endif > > + if (flags & RPMGLOB_NOCHECK) > > + gflags |= GLOB_NOCHECK; > > + > > diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > index bd3314a90f8..fc89b44132b 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > @@ -1,4 +1,4 @@ > > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 > > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Tue, 17 Jan 2017 14:07:17 +0200 > > Subject: [PATCH] When cross-installing, execute package scriptlets without > > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmscript.c | 11 ++++++++--- > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > -Index: git/lib/rpmscript.c > > -=================================================================== > > ---- git.orig/lib/rpmscript.c > > -+++ git/lib/rpmscript.c > > -@@ -18,7 +18,7 @@ > > - #include "rpmio/rpmio_internal.h" > > - > > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > > -- > > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > > - #include "debug.h" > > - > > - struct scriptNextFileFunc_s { > > -@@ -427,8 +427,7 @@ exit: > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > +index b18f851a3..36e37cf77 100644 > > +--- a/lib/rpmscript.c > > ++++ b/lib/rpmscript.c > > +@@ -448,8 +448,7 @@ exit: > > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > > > > if (fn) { > > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > > free(fn); > > } > > free(mline); > > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, > > > > if (rc != RPMRC_FAIL) { > > if (script_type & RPMSCRIPTLET_EXEC) { > > diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > index 64433abb6a1..5820b2e7e5b 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > @@ -1,4 +1,4 @@ > > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 > > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex@linutronix.de> > > Date: Tue, 31 Aug 2021 10:37:05 +0200 > > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata > > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > + > > --- > > build/pack.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > -Index: git/build/pack.c > > -=================================================================== > > ---- git.orig/build/pack.c > > -+++ git/build/pack.c > > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > > +diff --git a/build/pack.c b/build/pack.c > > +index f382c7da0..0889dd993 100644 > > +--- a/build/pack.c > > ++++ b/build/pack.c > > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); > > buf = xstrdup(rpmio_flags); > > buf[s - rpmio_flags] = '\0'; > > diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > deleted file mode 100644 > > index 29b6686a940..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > +++ /dev/null > > @@ -1,28 +0,0 @@ > > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 > > -From: Alexander Kanavin <alex@linutronix.de> > > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling > > - > > -x32 is a 64 bit x86 ABI with 32 bit pointers. > > - > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > ---- > > - configure.ac | 4 ++++ > > - 1 file changed, 4 insertions(+) > > - > > -Index: git/configure.ac > > -=================================================================== > > ---- git.orig/configure.ac > > -+++ git/configure.ac > > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > - host_os_gnu=-gnux32 > > - fi > > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > -+ host_os_gnu=-gnux32 > > -+fi > > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > > - fi > > diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > index 82e6567dc74..8b9f1f72944 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > @@ -1,4 +1,4 @@ > > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 > > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 > > From: Changqing Li <changqing.li@windriver.com> > > Date: Thu, 7 May 2020 17:40:58 +0800 > > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 > > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". > > Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> > > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > > + > > --- > > lib/transaction.c | 13 ++++++++++++- > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > -Index: git/lib/transaction.c > > -=================================================================== > > ---- git.orig/lib/transaction.c > > -+++ git/lib/transaction.c > > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > > +diff --git a/lib/transaction.c b/lib/transaction.c > > +index 70d2587ac..b89b30060 100644 > > +--- a/lib/transaction.c > > ++++ b/lib/transaction.c > > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > > rpmfsSetAction(ofs, ofx, FA_CREATE); > > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > > rConflicts = 0; > > diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > index a6c58699d36..388694d234f 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > @@ -1,4 +1,7 @@ > > -perl: disable auto requires > > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 > > +From: Mark Hatle <mark.hatle@windriver.com> > > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > > +Subject: [PATCH] perl: disable auto requires > > > > When generating automatic requirements, it's possible for perl scripts to > > declare 'optional' dependencies. These seem to often be incorrect and will > > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] > > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > > > -Index: git/fileattrs/perl.attr > > -=================================================================== > > ---- git.orig/fileattrs/perl.attr > > -+++ git/fileattrs/perl.attr > > +--- > > + fileattrs/perl.attr | 2 +- > > + fileattrs/perllib.attr | 2 +- > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > > +index 0daef58d5..81ddf5305 100644 > > +--- a/fileattrs/perl.attr > > ++++ b/fileattrs/perl.attr > > @@ -1,3 +1,3 @@ > > -%__perl_requires %{_rpmconfigdir}/perl.req > > +#__perl_requires %{_rpmconfigdir}/perl.req > > %__perl_magic ^.*[Pp]erl .*$ > > %__perl_flags exeonly > > -Index: git/fileattrs/perllib.attr > > -=================================================================== > > ---- git.orig/fileattrs/perllib.attr > > -+++ git/fileattrs/perllib.attr > > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > > +index fcad48099..495a28927 100644 > > +--- a/fileattrs/perllib.attr > > ++++ b/fileattrs/perllib.attr > > @@ -1,5 +1,5 @@ > > %__perllib_provides %{_rpmconfigdir}/perl.prov > > -%__perllib_requires %{_rpmconfigdir}/perl.req > > diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > deleted file mode 100644 > > index d0e637191a8..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > +++ /dev/null > > @@ -1,35 +0,0 @@ > > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 > > -From: Khem Raj <raj.khem@gmail.com> > > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash > > - > > -Fixes > > -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] > > -| hdr_hash, /* tp_hash */ > > -| ^~~~~~~~ > > - > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - python/header-py.c | 4 ++-- > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > - > > -diff --git a/python/header-py.c b/python/header-py.c > > -index 0aed0c9267..c15503f359 100644 > > ---- a/python/header-py.c > > -+++ b/python/header-py.c > > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) > > - "(Oi)", s, RPMTAG_NEVR); > > - } > > - > > --static long hdr_hash(PyObject * h) > > -+static Py_hash_t hdr_hash(PyObject * h) > > - { > > -- return (long) h; > > -+ return (Py_hash_t) h; > > - } > > - > > - static PyObject * hdr_reduce(hdrObject *s) > > --- > > -2.39.2 > > - > > diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > index 2fe96a839c3..89c23f81975 100644 > > --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > @@ -1,7 +1,7 @@ > > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 > > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Fri, 20 Jan 2017 13:33:05 +0200 > > -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > environment variable > > > > This is needed so that rpm can pick up target-specific configuration > > @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmrc.c | 19 ++++++++++++++----- > > 1 file changed, 14 insertions(+), 5 deletions(-) > > > > -Index: git/lib/rpmrc.c > > -=================================================================== > > ---- git.orig/lib/rpmrc.c > > -+++ git/lib/rpmrc.c > > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > +index f39dcfc11..f27f88753 100644 > > +--- a/lib/rpmrc.c > > ++++ b/lib/rpmrc.c > > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, > > static void setDefaults(void) > > { > > const char *confdir = rpmConfigDir(); > > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > > + > > if (!defrcfiles) { > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > -- SYSCONFDIR "/rpmrc", ":"); > > -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > +- SYSCONFDIR "/rpmrc", NULL); > > ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); > > } > > > > #ifndef MACROFILES > > @@ -468,9 +472,9 @@ static void setDefaults(void) > > confdir, "/platform/%{_target}/macros", ":", > > confdir, "/fileattrs/*.attr", ":", > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > + confdir, "/" RPM_VENDOR "/macros", ":", > > - SYSCONFDIR "/rpm/macros.*", ":", > > - SYSCONFDIR "/rpm/macros", ":", > > -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", > > + etcconfdir, SYSCONFDIR "/rpm/macros", ":", > > -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); > > ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > } > > #else > > macrofiles = MACROFILES; > > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > > */ > > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > { > > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > > static struct utsname un; > > char * chptr; > > canonEntry canon; > > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > > > if (arch) *arch = un.machine; > > if (os) *os = un.sysname; > > diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > new file mode 100644 > > index 00000000000..e7f0adc70c9 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > @@ -0,0 +1,26 @@ > > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html > > + > > +Building html would require doxygen-native. > > + > > +Upstream-Status: Inappropriate [oe-core specific] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > + > > +--- > > + docs/CMakeLists.txt | 1 - > > + 1 file changed, 1 deletion(-) > > + > > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > > +index 52dce7b4e..c01ff7757 100644 > > +--- a/docs/CMakeLists.txt > > ++++ b/docs/CMakeLists.txt > > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > > + endif() > > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) > > + > > + install(FILES > > + README.md > > diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > new file mode 100644 > > index 00000000000..3d4b09bedb6 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > @@ -0,0 +1,34 @@ > > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C > > + library > > + > > +This addresses musl failures; if there is code out there relying on > > +those braces, it needs to be fixed when used on musl. > > + > > +This is unlikely to be trivially fixable upstream. > > + > > +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > +--- > > + rpmio/rpmglob.c | 6 ++++++ > > + 1 file changed, 6 insertions(+) > > + > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > +index 243568766..43c27074a 100644 > > +--- a/rpmio/rpmglob.c > > ++++ b/rpmio/rpmglob.c > > +@@ -33,6 +33,12 @@ > > + > > + #include "debug.h" > > + > > ++/* Don't fail if the standard C library > > +++ * doesn't provide brace expansion */ > > ++#ifndef GLOB_BRACE > > ++#define GLOB_BRACE 0 > > ++#endif > > ++ > > + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ > > + static int ismagic(const char *pattern) > > + { > > diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > index 9dbe7125ded..b3d57cc8703 100644 > > --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > @@ -1,4 +1,4 @@ > > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 > > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Thu, 10 Jan 2019 18:14:18 +0100 > > Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO > > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmscript.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > -Index: git/lib/rpmscript.c > > -=================================================================== > > ---- git.orig/lib/rpmscript.c > > -+++ git/lib/rpmscript.c > > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > +index 37ada014c..bab0c97a6 100644 > > +--- a/lib/rpmscript.c > > ++++ b/lib/rpmscript.c > > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) > > if (Ferror(fd)) > > goto exit; > > > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > > static const char set_x[] = "set -x\n"; > > /* Assume failures will be caught by the write below */ > > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > char *mline = NULL; > > rpmRC rc = RPMRC_FAIL; > > > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > > > > if (script) { > > fn = writeScript(*argvp[0], script); > > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > sname, strerror(errno)); > > goto exit; > > } else if (pid == 0) {/* Child */ > > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > > sname, *argvp[0], (unsigned)getpid()); > > > > fclose(in); > > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > reaped = waitpid(pid, &status, 0); > > } while (reaped == -1 && errno == EINTR); > > > > diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > deleted file mode 100644 > > index 470dda1dcfb..00000000000 > > --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > +++ /dev/null > > @@ -1,51 +0,0 @@ > > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 > > -From: Panu Matilainen <pmatilai@redhat.com> > > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > > -Subject: [PATCH] Don't muck with per-process global sqlite configuration from > > - the db backend > > - > > -sqlite3_config() affects all in-process uses of sqlite. librpm being a > > -low-level library, it has no business whatsoever making such decisions > > -for the applications running on top of it. Besides that, the callback can > > -easily end up pointing to an already closed database, causing an > > -innocent API user to crash in librpm on an entirely unrelated error on > > -some other database. "Oops." > > - > > -The sqlite API doesn't seem to provide any per-db or non-global context > > -for logging errors, thus we can only remove the call and let sqlite output > > -errors the way it pleases (print through stderr, presumably). > > - > > -Thanks to Jan Palus for spotting and reporting! > > - > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] > > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > > ---- > > - lib/backend/sqlite.c | 8 -------- > > - 1 file changed, 8 deletions(-) > > - > > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > > -index 5a029d575a..b612732267 100644 > > ---- a/lib/backend/sqlite.c > > -+++ b/lib/backend/sqlite.c > > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) > > - sqlite3_result_int(sctx, match); > > - } > > - > > --static void errCb(void *data, int err, const char *msg) > > --{ > > -- rpmdb rdb = data; > > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > > -- rdb->db_descr, sqlite3_errstr(err), msg); > > --} > > -- > > - static int dbiCursorReset(dbiCursor dbc) > > - { > > - if (dbc->stmt) { > > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) > > - * the "database is locked" errors at every cost > > - */ > > - sqlite3_busy_timeout(sdb, 10000); > > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > > - > > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch > > deleted file mode 100644 > > index e5c84ebd498..00000000000 > > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 > > -From: Florian Festi <ffesti@redhat.com> > > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > > -Subject: [PATCH] Fix compiler error on clang > > - > > -Turns out variable declarations are not allowed after a label, even in > > -C99. And while some compilers don't seem to care others do. > > - > > -Moving the declaration of mayopen to the start of the function to avoid > > -this problem. > > - > > -Resolves: #2435 > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > ---- > > - lib/fsm.c | 3 ++- > > - 1 file changed, 2 insertions(+), 1 deletion(-) > > - > > -diff --git a/lib/fsm.c b/lib/fsm.c > > -index 5671ac642d..183293edb0 100644 > > ---- a/lib/fsm.c > > -+++ b/lib/fsm.c > > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; > > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; > > - int firstlinkfile = -1; > > -+ int mayopen = 0; > > - char *tid = NULL; > > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > > - struct filedata_s *firstlink = NULL; > > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > - > > - setmeta: > > - /* Special files require path-based ops */ > > -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > - if (!rc && fd == -1 && mayopen) { > > - int flags = O_RDONLY; > > - /* Only follow safe symlinks, and never on temporary files */ > > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > similarity index 72% > > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > > index 3e85cbb8efe..af11dec5ef3 100644 > > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > > LICENSE = "GPL-2.0-only" > > LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > > > > -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > > +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > > @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > > - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > > - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > > - file://fix-declaration.patch \ > > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ > > - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > > - file://0001-Fix-missing-basename-include-on-macOS.patch \ > > + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > > + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > > + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > > + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > > + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > > " > > > > PE = "1" > > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > > > > S = "${WORKDIR}/git" > > > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" > > DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" > > > > -inherit autotools gettext pkgconfig python3native > > -export PYTHON_ABI > > - > > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > > - > > -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe > > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > > - > > -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages > > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" > > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" > > > > # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs > > # --localstatedir prevents rpm from writing its database to native sysroot when building images > > -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset > > -# plugins both behave badly inside builds. > > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" > > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" > > +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > > +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > > + > > +inherit cmake gettext pkgconfig python3targetconfig > > +OECMAKE_GENERATOR = "Unix Makefiles" > > > > BBCLASSEXTEND = "native nativesdk" > > > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" > > -# The inhibit plugin serves no purpose outside of the target > > -PACKAGECONFIG:remove:class-native = "inhibit" > > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > > +PACKAGECONFIG ??= "internal-openpgp" > > > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > > -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > > -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" > > -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > > -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" > > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > > +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > > > > -ASNEEDED = "" > > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > > +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > > + > > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > > +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > > +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > > +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > > > > # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in > > # libmagic also has sysroot path contamination, so override it > > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > > ${libdir}/rpm/rpmdeps \ > > " > > > > -do_configure:prepend() { > > - mkdir -p ${S}/build-aux > > -} > > - > > do_install:append:class-native() { > > for tool in ${WRAPPER_TOOLS}; do > > test -x ${D}$tool && create_wrapper ${D}$tool \ > > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > > > > do_install:append () { > > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > > ${D}/${libdir}/rpm/macros > > > > } > > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > > ${libdir}/rpm/check-* \ > > ${libdir}/rpm/sepdebugcrcfix \ > > ${libdir}/rpm/find-lang.sh \ > > + ${libdir}/rpm/sysusers.sh \ > > ${libdir}/rpm/*provides* \ > > ${libdir}/rpm/*requires* \ > > ${libdir}/rpm/*deps* \ > > -- > > 2.39.2 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#194368): https://lists.openembedded.org/g/openembedded-core/message/194368 > > Mute This Topic: https://lists.openembedded.org/mt/103975822/1997914 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > ^ permalink raw reply [flat|nested] 20+ messages in thread
[parent not found: <17AE983A55179990.23935@lists.openembedded.org>]
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 [not found] ` <17AE983A55179990.23935@lists.openembedded.org> @ 2024-01-29 11:57 ` Alexander Kanavin 2024-01-29 12:11 ` Matt Madison 2024-01-29 16:44 ` Mark Hatle 0 siblings, 2 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-01-29 11:57 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core, Alexander Kanavin I sent a patch. Alex On Sun, 28 Jan 2024 at 20:04, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > > 0257: file = file.replace("%", "%%%%%%%%") > *** 0258: attr = get_attr(file) > ... > *** 0203: stat_f = os.stat(rootpath + "/" + path, > follow_symlinks=False) > > Exception: FileNotFoundError: [Errno 2] No such file or directory: > '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/nodejs/20.8.1/packages-split/nodejs-ptest/usr/lib/nodejs/ptest/test/fixtures/es-modules/test-esm-double-encoding-native%%%%%%%%20.mjs' > > Seems like 257 and 258 should be swapped. No idea what that % > replacement is for. > > Alex > > On Sun, 28 Jan 2024 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: > > > > I am seeing some failures in meta-oe ( especially nodejs ) which I > > suspect are due to rpm upgrade and patches around it. > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio > > > > On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin > > <alex.kanavin@gmail.com> wrote: > > > > > > Upstream has replaced autoconf with cmake, which necessitates a rewrite of the > > > recipe and available options, and a rebase to cmake of > > > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : > > > the patch was removing the NULL marker at the end of function arguments, > > > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > was restoring it (in addition to the actual change the patch was making). > > > Now both patches preserve the NULL terminator. > > > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > --- > > > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > > > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > > > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > > > ...satisfiable-dependency-when-building.patch | 12 +-- > > > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > > > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > > > ...-PATH-environment-variable-before-ru.patch | 12 +-- > > > ...lename-before-passing-it-to-basename.patch | 40 ---------- > > > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > > > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > > > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > > > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > > > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > > > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > > > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > > > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > > > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > > > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > > > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > > > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > > > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > > > .../rpm/files/fix-declaration.patch | 39 ---------- > > > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- > > > 23 files changed, 328 insertions(+), 383 deletions(-) > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch > > > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > index 9fa486dfd3c..96fe57dfeb8 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > @@ -1,4 +1,4 @@ > > > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 > > > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Thu, 9 Mar 2017 18:54:02 +0200 > > > Subject: [PATCH] Add a color setting for mips64_n32 binaries > > > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > 2 files changed, 6 insertions(+) > > > > > > diff --git a/build/rpmfc.c b/build/rpmfc.c > > > -index 26606378f..a16e3f4e9 100644 > > > +index 4b67a9bae..ed7e4e623 100644 > > > --- a/build/rpmfc.c > > > +++ b/build/rpmfc.c > > > -@@ -646,6 +646,7 @@ exit: > > > +@@ -660,6 +660,7 @@ exit: > > > static const struct rpmfcTokens_s rpmfcTokens[] = { > > > { "directory", RPMFC_INCLUDE }, > > > > > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > > > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > > > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > > > > > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > > > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > > > color = RPMFC_ELF32; > > > break; > > > } > > > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > > > if (elf) > > > elf_end(elf); > > > diff --git a/rpmrc.in b/rpmrc.in > > > -index 2975a3a0e..c7232b48b 100644 > > > +index 8646a966b..7349fdfd3 100644 > > > --- a/rpmrc.in > > > +++ b/rpmrc.in > > > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > > > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > > > archcolor: mips64r6 2 > > > archcolor: mips64r6el 2 > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > new file mode 100644 > > > index 00000000000..5053caae33f > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > @@ -0,0 +1,28 @@ > > > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > > > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than > > > + cmake modules > > > + > > > +Otherwise cmake will try to find libm, badly, and fail. > > > + > > > +Upstream-Status: Inappropriate [oe-core specific] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > + > > > +--- > > > + CMakeLists.txt | 2 +- > > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > > + > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index 7f0630453..d0ea565f3 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -187,7 +187,7 @@ set(REQFUNCS > > > + ) > > > + > > > + find_package(PkgConfig REQUIRED) > > > +-find_package(Lua 5.2 REQUIRED) > > > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > > > + find_package(ZLIB REQUIRED) > > > + find_package(BZip2) > > > + find_package(Iconv) > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > new file mode 100644 > > > index 00000000000..db83b176b41 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > @@ -0,0 +1,42 @@ > > > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > > > +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit > > > + option > > > + > > > +This was lost in autotools -> cmake transition. The particular > > > +reason to make it explicit is that readline is gpl version 3 > > > +licensed, and in some builds components under that license > > > +need to be excluded. > > > + > > > +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > +--- > > > + CMakeLists.txt | 7 ++++++- > > > + 1 file changed, 6 insertions(+), 1 deletion(-) > > > + > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index 0a474106e..89e27417f 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) > > > + option(WITH_FSVERITY "Build with fsverity support" OFF) > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > ++option(WITH_READLINE "Build with readline support" ON) > > > + > > > + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > +@@ -193,7 +194,11 @@ find_package(BZip2) > > > + find_package(Iconv) > > > + > > > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > > > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > > > ++ > > > ++if (WITH_READLINE) > > > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) > > > ++endif() > > > ++ > > > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > > > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > > > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > index 8440c3516d6..df5543873c1 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > @@ -1,4 +1,4 @@ > > > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 > > > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Mon, 9 Jan 2017 18:52:11 +0200 > > > Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in > > > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > build/pack.c | 4 ---- > > > 1 file changed, 4 deletions(-) > > > > > > -Index: git/build/pack.c > > > -=================================================================== > > > ---- git.orig/build/pack.c > > > -+++ git/build/pack.c > > > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > > > +diff --git a/build/pack.c b/build/pack.c > > > +index f7dac6d9a..f382c7da0 100644 > > > +--- a/build/pack.c > > > ++++ b/build/pack.c > > > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch > > > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); > > > } > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > index 8fdc5edb10b..b056d19741a 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > @@ -1,4 +1,4 @@ > > > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 > > > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Mon, 27 Feb 2017 09:43:30 +0200 > > > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for > > > @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > > > --- > > > - configure.ac | 2 +- > > > - macros.in | 2 +- > > > - rpm.am | 4 ++-- > > > - 3 files changed, 4 insertions(+), 4 deletions(-) > > > + CMakeLists.txt | 2 +- > > > + macros.in | 2 +- > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > -diff --git a/configure.ac b/configure.ac > > > -index e6676c581..ec28db9b6 100644 > > > ---- a/configure.ac > > > -+++ b/configure.ac > > > -@@ -942,7 +942,7 @@ else > > > - usrprefix=$prefix > > > - fi > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index 2767915fb..7f0630453 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > > > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > > > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > > > - AC_SUBST(RPMCONFIGDIR) > > > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") > > > ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > > > > - AC_SUBST(OBJDUMP) > > > + # Emulate libtool versioning. Before a public release: > > > diff --git a/macros.in b/macros.in > > > -index a2411d784..735b74d99 100644 > > > +index b49ffaad4..3acbe78f6 100644 > > > --- a/macros.in > > > +++ b/macros.in > > > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > > > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ > > > %_sharedstatedir %{_prefix}/com > > > %_localstatedir %{_prefix}/var > > > %_lib lib > > > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > > > %_includedir %{_prefix}/include > > > %_infodir %{_datadir}/info > > > %_mandir %{_datadir}/man > > > -diff --git a/rpm.am b/rpm.am > > > -index 55b5b3935..5a51f102b 100644 > > > ---- a/rpm.am > > > -+++ b/rpm.am > > > -@@ -1,10 +1,10 @@ > > > - # Internal binaries > > > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm > > > --rpmlibexecdir = $(prefix)/lib/rpm > > > -+rpmlibexecdir = $(libdir)/rpm > > > - > > > - # Host independent config files > > > - ## HACK: it probably should be $(datadir)/rpm > > > --rpmconfigdir = $(prefix)/lib/rpm > > > -+rpmconfigdir = $(libdir)/rpm > > > - > > > - # Libtool version (current-revision-age) for all our libraries > > > - rpm_version_info = 13:0:4 > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > index fda64eefe01..6a18679da2f 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > @@ -1,35 +1,36 @@ > > > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 > > > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Tue, 10 Jan 2017 14:11:30 +0200 > > > Subject: [PATCH] Do not read config files from $HOME > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmrc.c | 6 ++---- > > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > > > -Index: git/lib/rpmrc.c > > > -=================================================================== > > > ---- git.orig/lib/rpmrc.c > > > -+++ git/lib/rpmrc.c > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > > +index 269d490ac..f39dcfc11 100644 > > > +--- a/lib/rpmrc.c > > > ++++ b/lib/rpmrc.c > > > @@ -458,8 +458,7 @@ static void setDefaults(void) > > > if (!defrcfiles) { > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > > - SYSCONFDIR "/rpmrc", ":", > > > - "~/.rpmrc", NULL); > > > -+ SYSCONFDIR "/rpmrc", ":"); > > > ++ SYSCONFDIR "/rpmrc", NULL); > > > } > > > > > > #ifndef MACROFILES > > > @@ -471,8 +470,7 @@ static void setDefaults(void) > > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > > + confdir, "/" RPM_VENDOR "/macros", ":", > > > SYSCONFDIR "/rpm/macros.*", ":", > > > SYSCONFDIR "/rpm/macros", ":", > > > - SYSCONFDIR "/rpm/%{_target}/macros", ":", > > > - "~/.rpmmacros", NULL); > > > -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > > ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > > } > > > #else > > > macrofiles = MACROFILES; > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > index ae24b663aae..318f65ed375 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > @@ -1,4 +1,4 @@ > > > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 > > > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Fri, 20 Jan 2017 13:32:06 +0200 > > > Subject: [PATCH] Do not reset the PATH environment variable before running > > > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > lib/rpmscript.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > -Index: git/lib/rpmscript.c > > > -=================================================================== > > > ---- git.orig/lib/rpmscript.c > > > -+++ git/lib/rpmscript.c > > > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > +index 36e37cf77..37ada014c 100644 > > > +--- a/lib/rpmscript.c > > > ++++ b/lib/rpmscript.c > > > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, > > > if (ipath && ipath[5] != '%') > > > path = ipath; > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > deleted file mode 100644 > > > index f9b809d1676..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > +++ /dev/null > > > @@ -1,40 +0,0 @@ > > > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 > > > -From: Florian Festi <ffesti@redhat.com> > > > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > > > -Subject: [PATCH] Duplicate filename before passing it to basename > > > - > > > -basename is allowed change the string passed to it. While we don't need > > > -the filename after that just casting away the const seems a bit too > > > -hacky. > > > - > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- > > > - tools/rpmuncompress.c | 4 +++- > > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > > - > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > > -index 58ddf5683..e13cc6a66 100644 > > > ---- a/tools/rpmuncompress.c > > > -+++ b/tools/rpmuncompress.c > > > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > > > - if (needtar) { > > > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); > > > - } else if (at->compressed == COMPRESSED_GEM) { > > > -- const char *bn = basename(fn); > > > -+ char *tmp = xstrdup(fn); > > > -+ const char *bn = basename(tmp); > > > - size_t nvlen = strlen(bn) - 3; > > > - char *gem = rpmGetPath("%{__gem}", NULL); > > > - char *gemspec = NULL; > > > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > > > - > > > - free(gemspec); > > > - free(gem); > > > -+ free(tmp); > > > - } else { > > > - rasprintf(&buf, "%s '%s'", zipper, fn); > > > - } > > > --- > > > -2.43.0 > > > - > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > deleted file mode 100644 > > > index a93597a8352..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > +++ /dev/null > > > @@ -1,26 +0,0 @@ > > > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 > > > -From: Calvin Buckley <calvin@cmpct.info> > > > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > > > -Subject: [PATCH] Fix missing basename include on macOS > > > - > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- > > > - tools/rpmuncompress.c | 1 + > > > - 1 file changed, 1 insertion(+) > > > - > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > > -index bd4146d54..58ddf5683 100644 > > > ---- a/tools/rpmuncompress.c > > > -+++ b/tools/rpmuncompress.c > > > -@@ -1,6 +1,7 @@ > > > - #include "system.h" > > > - > > > - #include <popt.h> > > > -+#include <libgen.h> > > > - #include <errno.h> > > > - #include <stdio.h> > > > - #include <string.h> > > > --- > > > -2.43.0 > > > - > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > new file mode 100644 > > > index 00000000000..8e73e077049 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > @@ -0,0 +1,56 @@ > > > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 > > > +From: Panu Matilainen <pmatilai@redhat.com> > > > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > > > +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag > > > + > > > +This regressed when we axed our internal glob copy in commit > > > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only > > > +an optimization so we can just skip it if not available. > > > + > > > +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > +--- > > > + CMakeLists.txt | 1 + > > > + config.h.in | 1 + > > > + rpmio/rpmglob.c | 2 ++ > > > + 3 files changed, 4 insertions(+) > > > + > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index d0ea565f3..0a474106e 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > > > + set(HAVE_LIBDW 1) > > > + endif() > > > + > > > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > > > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > > > + if (NOT MAJOR_IN_SYSMACROS) > > > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > > > +diff --git a/config.h.in b/config.h.in > > > +index cb97827d0..ab1757a9a 100644 > > > +--- a/config.h.in > > > ++++ b/config.h.in > > > +@@ -100,6 +100,7 @@ > > > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > > > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > > > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > > > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > > > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > > > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > > > + #cmakedefine RUNDIR @rundir@ > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > > +index 8276eddb4..243568766 100644 > > > +--- a/rpmio/rpmglob.c > > > ++++ b/rpmio/rpmglob.c > > > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, > > > + gflags |= GLOB_BRACE; > > > + if (home != NULL && strlen(home) > 0) > > > + gflags |= GLOB_TILDE; > > > ++#if HAVE_GLOB_ONLYDIR > > > + if (dir_only) > > > + gflags |= GLOB_ONLYDIR; > > > ++#endif > > > + if (flags & RPMGLOB_NOCHECK) > > > + gflags |= GLOB_NOCHECK; > > > + > > > diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > index bd3314a90f8..fc89b44132b 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > @@ -1,4 +1,4 @@ > > > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 > > > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Tue, 17 Jan 2017 14:07:17 +0200 > > > Subject: [PATCH] When cross-installing, execute package scriptlets without > > > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmscript.c | 11 ++++++++--- > > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > > > -Index: git/lib/rpmscript.c > > > -=================================================================== > > > ---- git.orig/lib/rpmscript.c > > > -+++ git/lib/rpmscript.c > > > -@@ -18,7 +18,7 @@ > > > - #include "rpmio/rpmio_internal.h" > > > - > > > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > > > -- > > > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > > > - #include "debug.h" > > > - > > > - struct scriptNextFileFunc_s { > > > -@@ -427,8 +427,7 @@ exit: > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > +index b18f851a3..36e37cf77 100644 > > > +--- a/lib/rpmscript.c > > > ++++ b/lib/rpmscript.c > > > +@@ -448,8 +448,7 @@ exit: > > > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > > > > > > if (fn) { > > > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > > > free(fn); > > > } > > > free(mline); > > > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > > > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, > > > > > > if (rc != RPMRC_FAIL) { > > > if (script_type & RPMSCRIPTLET_EXEC) { > > > diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > index 64433abb6a1..5820b2e7e5b 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > @@ -1,4 +1,4 @@ > > > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 > > > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex@linutronix.de> > > > Date: Tue, 31 Aug 2021 10:37:05 +0200 > > > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata > > > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > + > > > --- > > > build/pack.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > -Index: git/build/pack.c > > > -=================================================================== > > > ---- git.orig/build/pack.c > > > -+++ git/build/pack.c > > > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > > > +diff --git a/build/pack.c b/build/pack.c > > > +index f382c7da0..0889dd993 100644 > > > +--- a/build/pack.c > > > ++++ b/build/pack.c > > > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > > > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); > > > buf = xstrdup(rpmio_flags); > > > buf[s - rpmio_flags] = '\0'; > > > diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > deleted file mode 100644 > > > index 29b6686a940..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > +++ /dev/null > > > @@ -1,28 +0,0 @@ > > > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 > > > -From: Alexander Kanavin <alex@linutronix.de> > > > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > > > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling > > > - > > > -x32 is a 64 bit x86 ABI with 32 bit pointers. > > > - > > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > ---- > > > - configure.ac | 4 ++++ > > > - 1 file changed, 4 insertions(+) > > > - > > > -Index: git/configure.ac > > > -=================================================================== > > > ---- git.orig/configure.ac > > > -+++ git/configure.ac > > > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > > - host_os_gnu=-gnux32 > > > - fi > > > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > > > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > > -+ host_os_gnu=-gnux32 > > > -+fi > > > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > > > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > > > - fi > > > diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > index 82e6567dc74..8b9f1f72944 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > @@ -1,4 +1,4 @@ > > > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 > > > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 > > > From: Changqing Li <changqing.li@windriver.com> > > > Date: Thu, 7 May 2020 17:40:58 +0800 > > > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 > > > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". > > > Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> > > > > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > > > + > > > --- > > > lib/transaction.c | 13 ++++++++++++- > > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > > > -Index: git/lib/transaction.c > > > -=================================================================== > > > ---- git.orig/lib/transaction.c > > > -+++ git/lib/transaction.c > > > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > > > +diff --git a/lib/transaction.c b/lib/transaction.c > > > +index 70d2587ac..b89b30060 100644 > > > +--- a/lib/transaction.c > > > ++++ b/lib/transaction.c > > > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > > > rpmfsSetAction(ofs, ofx, FA_CREATE); > > > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > > > rConflicts = 0; > > > diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > index a6c58699d36..388694d234f 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > @@ -1,4 +1,7 @@ > > > -perl: disable auto requires > > > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 > > > +From: Mark Hatle <mark.hatle@windriver.com> > > > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > > > +Subject: [PATCH] perl: disable auto requires > > > > > > When generating automatic requirements, it's possible for perl scripts to > > > declare 'optional' dependencies. These seem to often be incorrect and will > > > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] > > > > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > > > > > -Index: git/fileattrs/perl.attr > > > -=================================================================== > > > ---- git.orig/fileattrs/perl.attr > > > -+++ git/fileattrs/perl.attr > > > +--- > > > + fileattrs/perl.attr | 2 +- > > > + fileattrs/perllib.attr | 2 +- > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > + > > > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > > > +index 0daef58d5..81ddf5305 100644 > > > +--- a/fileattrs/perl.attr > > > ++++ b/fileattrs/perl.attr > > > @@ -1,3 +1,3 @@ > > > -%__perl_requires %{_rpmconfigdir}/perl.req > > > +#__perl_requires %{_rpmconfigdir}/perl.req > > > %__perl_magic ^.*[Pp]erl .*$ > > > %__perl_flags exeonly > > > -Index: git/fileattrs/perllib.attr > > > -=================================================================== > > > ---- git.orig/fileattrs/perllib.attr > > > -+++ git/fileattrs/perllib.attr > > > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > > > +index fcad48099..495a28927 100644 > > > +--- a/fileattrs/perllib.attr > > > ++++ b/fileattrs/perllib.attr > > > @@ -1,5 +1,5 @@ > > > %__perllib_provides %{_rpmconfigdir}/perl.prov > > > -%__perllib_requires %{_rpmconfigdir}/perl.req > > > diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > deleted file mode 100644 > > > index d0e637191a8..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > +++ /dev/null > > > @@ -1,35 +0,0 @@ > > > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 > > > -From: Khem Raj <raj.khem@gmail.com> > > > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > > > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash > > > - > > > -Fixes > > > -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] > > > -| hdr_hash, /* tp_hash */ > > > -| ^~~~~~~~ > > > - > > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- > > > - python/header-py.c | 4 ++-- > > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > > - > > > -diff --git a/python/header-py.c b/python/header-py.c > > > -index 0aed0c9267..c15503f359 100644 > > > ---- a/python/header-py.c > > > -+++ b/python/header-py.c > > > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) > > > - "(Oi)", s, RPMTAG_NEVR); > > > - } > > > - > > > --static long hdr_hash(PyObject * h) > > > -+static Py_hash_t hdr_hash(PyObject * h) > > > - { > > > -- return (long) h; > > > -+ return (Py_hash_t) h; > > > - } > > > - > > > - static PyObject * hdr_reduce(hdrObject *s) > > > --- > > > -2.39.2 > > > - > > > diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > index 2fe96a839c3..89c23f81975 100644 > > > --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > @@ -1,7 +1,7 @@ > > > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 > > > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Fri, 20 Jan 2017 13:33:05 +0200 > > > -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > > +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > > environment variable > > > > > > This is needed so that rpm can pick up target-specific configuration > > > @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmrc.c | 19 ++++++++++++++----- > > > 1 file changed, 14 insertions(+), 5 deletions(-) > > > > > > -Index: git/lib/rpmrc.c > > > -=================================================================== > > > ---- git.orig/lib/rpmrc.c > > > -+++ git/lib/rpmrc.c > > > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > > +index f39dcfc11..f27f88753 100644 > > > +--- a/lib/rpmrc.c > > > ++++ b/lib/rpmrc.c > > > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, > > > static void setDefaults(void) > > > { > > > const char *confdir = rpmConfigDir(); > > > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > > > + > > > if (!defrcfiles) { > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > > -- SYSCONFDIR "/rpmrc", ":"); > > > -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); > > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > > +- SYSCONFDIR "/rpmrc", NULL); > > > ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); > > > } > > > > > > #ifndef MACROFILES > > > @@ -468,9 +472,9 @@ static void setDefaults(void) > > > confdir, "/platform/%{_target}/macros", ":", > > > confdir, "/fileattrs/*.attr", ":", > > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > > + confdir, "/" RPM_VENDOR "/macros", ":", > > > - SYSCONFDIR "/rpm/macros.*", ":", > > > - SYSCONFDIR "/rpm/macros", ":", > > > -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > > +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > > + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", > > > + etcconfdir, SYSCONFDIR "/rpm/macros", ":", > > > -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); > > > ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > > } > > > #else > > > macrofiles = MACROFILES; > > > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > > > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > > > */ > > > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > > { > > > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > > > static struct utsname un; > > > char * chptr; > > > canonEntry canon; > > > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > > > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > > > > > if (arch) *arch = un.machine; > > > if (os) *os = un.sysname; > > > diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > new file mode 100644 > > > index 00000000000..e7f0adc70c9 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > @@ -0,0 +1,26 @@ > > > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > > > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html > > > + > > > +Building html would require doxygen-native. > > > + > > > +Upstream-Status: Inappropriate [oe-core specific] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > + > > > +--- > > > + docs/CMakeLists.txt | 1 - > > > + 1 file changed, 1 deletion(-) > > > + > > > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > > > +index 52dce7b4e..c01ff7757 100644 > > > +--- a/docs/CMakeLists.txt > > > ++++ b/docs/CMakeLists.txt > > > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > > > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > > > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > > > + endif() > > > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) > > > + > > > + install(FILES > > > + README.md > > > diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > new file mode 100644 > > > index 00000000000..3d4b09bedb6 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > @@ -0,0 +1,34 @@ > > > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > > > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C > > > + library > > > + > > > +This addresses musl failures; if there is code out there relying on > > > +those braces, it needs to be fixed when used on musl. > > > + > > > +This is unlikely to be trivially fixable upstream. > > > + > > > +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > +--- > > > + rpmio/rpmglob.c | 6 ++++++ > > > + 1 file changed, 6 insertions(+) > > > + > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > > +index 243568766..43c27074a 100644 > > > +--- a/rpmio/rpmglob.c > > > ++++ b/rpmio/rpmglob.c > > > +@@ -33,6 +33,12 @@ > > > + > > > + #include "debug.h" > > > + > > > ++/* Don't fail if the standard C library > > > +++ * doesn't provide brace expansion */ > > > ++#ifndef GLOB_BRACE > > > ++#define GLOB_BRACE 0 > > > ++#endif > > > ++ > > > + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ > > > + static int ismagic(const char *pattern) > > > + { > > > diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > index 9dbe7125ded..b3d57cc8703 100644 > > > --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > @@ -1,4 +1,4 @@ > > > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 > > > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Thu, 10 Jan 2019 18:14:18 +0100 > > > Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO > > > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmscript.c | 8 ++++---- > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > -Index: git/lib/rpmscript.c > > > -=================================================================== > > > ---- git.orig/lib/rpmscript.c > > > -+++ git/lib/rpmscript.c > > > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > +index 37ada014c..bab0c97a6 100644 > > > +--- a/lib/rpmscript.c > > > ++++ b/lib/rpmscript.c > > > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) > > > if (Ferror(fd)) > > > goto exit; > > > > > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > > > static const char set_x[] = "set -x\n"; > > > /* Assume failures will be caught by the write below */ > > > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > > > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > > char *mline = NULL; > > > rpmRC rc = RPMRC_FAIL; > > > > > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > > > > > > if (script) { > > > fn = writeScript(*argvp[0], script); > > > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > > sname, strerror(errno)); > > > goto exit; > > > } else if (pid == 0) {/* Child */ > > > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > > > sname, *argvp[0], (unsigned)getpid()); > > > > > > fclose(in); > > > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > > reaped = waitpid(pid, &status, 0); > > > } while (reaped == -1 && errno == EINTR); > > > > > > diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > deleted file mode 100644 > > > index 470dda1dcfb..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > +++ /dev/null > > > @@ -1,51 +0,0 @@ > > > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 > > > -From: Panu Matilainen <pmatilai@redhat.com> > > > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > > > -Subject: [PATCH] Don't muck with per-process global sqlite configuration from > > > - the db backend > > > - > > > -sqlite3_config() affects all in-process uses of sqlite. librpm being a > > > -low-level library, it has no business whatsoever making such decisions > > > -for the applications running on top of it. Besides that, the callback can > > > -easily end up pointing to an already closed database, causing an > > > -innocent API user to crash in librpm on an entirely unrelated error on > > > -some other database. "Oops." > > > - > > > -The sqlite API doesn't seem to provide any per-db or non-global context > > > -for logging errors, thus we can only remove the call and let sqlite output > > > -errors the way it pleases (print through stderr, presumably). > > > - > > > -Thanks to Jan Palus for spotting and reporting! > > > - > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] > > > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > > > ---- > > > - lib/backend/sqlite.c | 8 -------- > > > - 1 file changed, 8 deletions(-) > > > - > > > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > > > -index 5a029d575a..b612732267 100644 > > > ---- a/lib/backend/sqlite.c > > > -+++ b/lib/backend/sqlite.c > > > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) > > > - sqlite3_result_int(sctx, match); > > > - } > > > - > > > --static void errCb(void *data, int err, const char *msg) > > > --{ > > > -- rpmdb rdb = data; > > > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > > > -- rdb->db_descr, sqlite3_errstr(err), msg); > > > --} > > > -- > > > - static int dbiCursorReset(dbiCursor dbc) > > > - { > > > - if (dbc->stmt) { > > > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) > > > - * the "database is locked" errors at every cost > > > - */ > > > - sqlite3_busy_timeout(sdb, 10000); > > > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > > > - > > > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > > > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > > > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch > > > deleted file mode 100644 > > > index e5c84ebd498..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > > > +++ /dev/null > > > @@ -1,39 +0,0 @@ > > > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 > > > -From: Florian Festi <ffesti@redhat.com> > > > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > > > -Subject: [PATCH] Fix compiler error on clang > > > - > > > -Turns out variable declarations are not allowed after a label, even in > > > -C99. And while some compilers don't seem to care others do. > > > - > > > -Moving the declaration of mayopen to the start of the function to avoid > > > -this problem. > > > - > > > -Resolves: #2435 > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > ---- > > > - lib/fsm.c | 3 ++- > > > - 1 file changed, 2 insertions(+), 1 deletion(-) > > > - > > > -diff --git a/lib/fsm.c b/lib/fsm.c > > > -index 5671ac642d..183293edb0 100644 > > > ---- a/lib/fsm.c > > > -+++ b/lib/fsm.c > > > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; > > > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; > > > - int firstlinkfile = -1; > > > -+ int mayopen = 0; > > > - char *tid = NULL; > > > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > > > - struct filedata_s *firstlink = NULL; > > > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > > - > > > - setmeta: > > > - /* Special files require path-based ops */ > > > -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > > -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > > - if (!rc && fd == -1 && mayopen) { > > > - int flags = O_RDONLY; > > > - /* Only follow safe symlinks, and never on temporary files */ > > > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > similarity index 72% > > > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > > > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > index 3e85cbb8efe..af11dec5ef3 100644 > > > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > > > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > > > LICENSE = "GPL-2.0-only" > > > LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > > > > > > -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > > > +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > > > @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > > > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > > > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > > > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > > > - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > > > - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > > > - file://fix-declaration.patch \ > > > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ > > > - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > > > - file://0001-Fix-missing-basename-include-on-macOS.patch \ > > > + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > > > + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > > > + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > > > + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > > > + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > > > " > > > > > > PE = "1" > > > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > > > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > > > > > > S = "${WORKDIR}/git" > > > > > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > > > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" > > > DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" > > > > > > -inherit autotools gettext pkgconfig python3native > > > -export PYTHON_ABI > > > - > > > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > > > - > > > -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe > > > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > > > - > > > -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages > > > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" > > > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > > > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" > > > > > > # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs > > > # --localstatedir prevents rpm from writing its database to native sysroot when building images > > > -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset > > > -# plugins both behave badly inside builds. > > > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" > > > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" > > > +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > > > +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > > > + > > > +inherit cmake gettext pkgconfig python3targetconfig > > > +OECMAKE_GENERATOR = "Unix Makefiles" > > > > > > BBCLASSEXTEND = "native nativesdk" > > > > > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" > > > -# The inhibit plugin serves no purpose outside of the target > > > -PACKAGECONFIG:remove:class-native = "inhibit" > > > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > > > +PACKAGECONFIG ??= "internal-openpgp" > > > > > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > > > -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > > > -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" > > > -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > > > -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" > > > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > > > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > > > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > > > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > > > +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > > > > > > -ASNEEDED = "" > > > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > > > +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > > > + > > > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > > > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > > > +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > > > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > > > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > > > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > > > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > > > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > > > +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > > > +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > > > > > > # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in > > > # libmagic also has sysroot path contamination, so override it > > > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > > > ${libdir}/rpm/rpmdeps \ > > > " > > > > > > -do_configure:prepend() { > > > - mkdir -p ${S}/build-aux > > > -} > > > - > > > do_install:append:class-native() { > > > for tool in ${WRAPPER_TOOLS}; do > > > test -x ${D}$tool && create_wrapper ${D}$tool \ > > > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > > > > > > do_install:append () { > > > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > > > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > > > ${D}/${libdir}/rpm/macros > > > > > > } > > > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > > > ${libdir}/rpm/check-* \ > > > ${libdir}/rpm/sepdebugcrcfix \ > > > ${libdir}/rpm/find-lang.sh \ > > > + ${libdir}/rpm/sysusers.sh \ > > > ${libdir}/rpm/*provides* \ > > > ${libdir}/rpm/*requires* \ > > > ${libdir}/rpm/*deps* \ > > > -- > > > 2.39.2 > > > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#194451): https://lists.openembedded.org/g/openembedded-core/message/194451 > Mute This Topic: https://lists.openembedded.org/mt/103975822/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-29 11:57 ` Alexander Kanavin @ 2024-01-29 12:11 ` Matt Madison 2024-01-29 12:22 ` Alexander Kanavin 2024-01-29 16:44 ` Mark Hatle 1 sibling, 1 reply; 20+ messages in thread From: Matt Madison @ 2024-01-29 12:11 UTC (permalink / raw) To: Alexander Kanavin; +Cc: Khem Raj, openembedded-core, Alexander Kanavin [-- Attachment #1: Type: text/plain, Size: 66573 bytes --] I ran across a different failure due to the rpm upgrade, which I've traced to this change: https://github.com/rpm-software-management/rpm/commit/162110aadad445cc248a68dc4c840fe05b79d00f This is enabling 64-bit filesystem calls in the rpm-native build, causing it to use statvfs64() instead of statvfs(). Pseudo doesn't handle statvfs64(), so when rpm checks available disk space, it's looking at the host system's rootfs instead of the disk where the build is happening. I'm not sure whether pseudo needs an update, or whether the hard-coded define added by the above-mentioned commit should be turned off for -native builds. Regards, -Matt On Mon, Jan 29, 2024 at 3:57 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > I sent a patch. > > Alex > > On Sun, 28 Jan 2024 at 20:04, Alexander Kanavin via > lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> > wrote: > > > > 0257: file = file.replace("%", "%%%%%%%%") > > *** 0258: attr = get_attr(file) > > ... > > *** 0203: stat_f = os.stat(rootpath + "/" + path, > > follow_symlinks=False) > > > > Exception: FileNotFoundError: [Errno 2] No such file or directory: > > > '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/nodejs/20.8.1/packages-split/nodejs-ptest/usr/lib/nodejs/ptest/test/fixtures/es-modules/test-esm-double-encoding-native%%%%%%%%20.mjs' > > > > Seems like 257 and 258 should be swapped. No idea what that % > > replacement is for. > > > > Alex > > > > On Sun, 28 Jan 2024 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: > > > > > > I am seeing some failures in meta-oe ( especially nodejs ) which I > > > suspect are due to rpm upgrade and patches around it. > > > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio > > > > > > On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin > > > <alex.kanavin@gmail.com> wrote: > > > > > > > > Upstream has replaced autoconf with cmake, which necessitates a > rewrite of the > > > > recipe and available options, and a rebase to cmake of > > > > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > > > > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : > > > > the patch was removing the NULL marker at the end of function > arguments, > > > > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > > was restoring it (in addition to the actual change the patch was > making). > > > > Now both patches preserve the NULL terminator. > > > > > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > --- > > > > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > > > > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > > > > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > > > > ...satisfiable-dependency-when-building.patch | 12 +-- > > > > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > > > > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > > > > ...-PATH-environment-variable-before-ru.patch | 12 +-- > > > > ...lename-before-passing-it-to-basename.patch | 40 ---------- > > > > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > > > > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > > > > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > > > > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > > > > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > > > > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > > > > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > > > > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > > > > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > > > > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > > > > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > > > > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > > > > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > > > > .../rpm/files/fix-declaration.patch | 39 ---------- > > > > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 > ++++++++----------- > > > > 23 files changed, 328 insertions(+), 383 deletions(-) > > > > create mode 100644 > meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > > create mode 100644 > meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > > create mode 100644 > meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > > create mode 100644 > meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > > create mode 100644 > meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > > delete mode 100644 > meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > > delete mode 100644 > meta/recipes-devtools/rpm/files/fix-declaration.patch > > > > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} > (72%) > > > > > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > > index 9fa486dfd3c..96fe57dfeb8 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > > @@ -1,4 +1,4 @@ > > > > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 > 2001 > > > > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Thu, 9 Mar 2017 18:54:02 +0200 > > > > Subject: [PATCH] Add a color setting for mips64_n32 binaries > > > > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > > > > 2 files changed, 6 insertions(+) > > > > > > > > diff --git a/build/rpmfc.c b/build/rpmfc.c > > > > -index 26606378f..a16e3f4e9 100644 > > > > +index 4b67a9bae..ed7e4e623 100644 > > > > --- a/build/rpmfc.c > > > > +++ b/build/rpmfc.c > > > > -@@ -646,6 +646,7 @@ exit: > > > > +@@ -660,6 +660,7 @@ exit: > > > > static const struct rpmfcTokens_s rpmfcTokens[] = { > > > > { "directory", RPMFC_INCLUDE }, > > > > > > > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > > > > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > > > > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > > > > > > > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > > > > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > > > > color = RPMFC_ELF32; > > > > break; > > > > } > > > > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > > > > if (elf) > > > > elf_end(elf); > > > > diff --git a/rpmrc.in b/rpmrc.in > > > > -index 2975a3a0e..c7232b48b 100644 > > > > +index 8646a966b..7349fdfd3 100644 > > > > --- a/rpmrc.in > > > > +++ b/rpmrc.in > > > > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > > > > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > > > > archcolor: mips64r6 2 > > > > archcolor: mips64r6el 2 > > > > > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > > new file mode 100644 > > > > index 00000000000..5053caae33f > > > > --- /dev/null > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > > @@ -0,0 +1,28 @@ > > > > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 > 2001 > > > > +From: Alexander Kanavin <alex@linutronix.de> > > > > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > > > > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config > rather than > > > > + cmake modules > > > > + > > > > +Otherwise cmake will try to find libm, badly, and fail. > > > > + > > > > +Upstream-Status: Inappropriate [oe-core specific] > > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > + > > > > +--- > > > > + CMakeLists.txt | 2 +- > > > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > > > + > > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > > +index 7f0630453..d0ea565f3 100644 > > > > +--- a/CMakeLists.txt > > > > ++++ b/CMakeLists.txt > > > > +@@ -187,7 +187,7 @@ set(REQFUNCS > > > > + ) > > > > + > > > > + find_package(PkgConfig REQUIRED) > > > > +-find_package(Lua 5.2 REQUIRED) > > > > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > > > > + find_package(ZLIB REQUIRED) > > > > + find_package(BZip2) > > > > + find_package(Iconv) > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > > new file mode 100644 > > > > index 00000000000..db83b176b41 > > > > --- /dev/null > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > > @@ -0,0 +1,42 @@ > > > > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 > 2001 > > > > +From: Alexander Kanavin <alex@linutronix.de> > > > > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > > > > +Subject: [PATCH] CMakeLists.txt: restore readline support as an > explicit > > > > + option > > > > + > > > > +This was lost in autotools -> cmake transition. The particular > > > > +reason to make it explicit is that readline is gpl version 3 > > > > +licensed, and in some builds components under that license > > > > +need to be excluded. > > > > + > > > > +Upstream-Status: Submitted [ > https://github.com/rpm-software-management/rpm/pull/2852] > > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > +--- > > > > + CMakeLists.txt | 7 ++++++- > > > > + 1 file changed, 6 insertions(+), 1 deletion(-) > > > > + > > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > > +index 0a474106e..89e27417f 100644 > > > > +--- a/CMakeLists.txt > > > > ++++ b/CMakeLists.txt > > > > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) > > > > + option(WITH_FSVERITY "Build with fsverity support" OFF) > > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > > ++option(WITH_READLINE "Build with readline support" ON) > > > > + > > > > + set(RPM_CONFIGDIR > "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > > +@@ -193,7 +194,11 @@ find_package(BZip2) > > > > + find_package(Iconv) > > > > + > > > > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > > > > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > > > > ++ > > > > ++if (WITH_READLINE) > > > > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) > > > > ++endif() > > > > ++ > > > > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > > > > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > > > > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > > index 8440c3516d6..df5543873c1 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > > @@ -1,4 +1,4 @@ > > > > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 > 2001 > > > > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Mon, 9 Jan 2017 18:52:11 +0200 > > > > Subject: [PATCH] Do not add an unsatisfiable dependency when > building rpms in > > > > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > > > > build/pack.c | 4 ---- > > > > 1 file changed, 4 deletions(-) > > > > > > > > -Index: git/build/pack.c > > > > -=================================================================== > > > > ---- git.orig/build/pack.c > > > > -+++ git/build/pack.c > > > > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > > > > +diff --git a/build/pack.c b/build/pack.c > > > > +index f7dac6d9a..f382c7da0 100644 > > > > +--- a/build/pack.c > > > > ++++ b/build/pack.c > > > > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, > Package pkg, const char *cookie, int ch > > > > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, > spec->sourcePkgId,16); > > > > } > > > > > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > index 8fdc5edb10b..b056d19741a 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > @@ -1,4 +1,4 @@ > > > > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 > 2001 > > > > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Mon, 27 Feb 2017 09:43:30 +0200 > > > > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path > for > > > > @@ -8,29 +8,28 @@ Upstream-Status: Denied [ > https://github.com/rpm-software-management/rpm/pull/263 > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > > > > > --- > > > > - configure.ac | 2 +- > > > > - macros.in | 2 +- > > > > - rpm.am | 4 ++-- > > > > - 3 files changed, 4 insertions(+), 4 deletions(-) > > > > + CMakeLists.txt | 2 +- > > > > + macros.in | 2 +- > > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > > > -diff --git a/configure.ac b/configure.ac > > > > -index e6676c581..ec28db9b6 100644 > > > > ---- a/configure.ac > > > > -+++ b/configure.ac > > > > -@@ -942,7 +942,7 @@ else > > > > - usrprefix=$prefix > > > > - fi > > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > > +index 2767915fb..7f0630453 100644 > > > > +--- a/CMakeLists.txt > > > > ++++ b/CMakeLists.txt > > > > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity > support" OFF) > > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > > > > > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > > > > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > > > > - AC_SUBST(RPMCONFIGDIR) > > > > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH > "rpm home") > > > > ++set(RPM_CONFIGDIR > "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > > > > > > - AC_SUBST(OBJDUMP) > > > > + # Emulate libtool versioning. Before a public release: > > > > diff --git a/macros.in b/macros.in > > > > -index a2411d784..735b74d99 100644 > > > > +index b49ffaad4..3acbe78f6 100644 > > > > --- a/macros.in > > > > +++ b/macros.in > > > > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > > > > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} > and langpacks-%{1})\ > > > > %_sharedstatedir %{_prefix}/com > > > > %_localstatedir %{_prefix}/var > > > > %_lib lib > > > > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > > > > %_includedir %{_prefix}/include > > > > %_infodir %{_datadir}/info > > > > %_mandir %{_datadir}/man > > > > -diff --git a/rpm.am b/rpm.am > > > > -index 55b5b3935..5a51f102b 100644 > > > > ---- a/rpm.am > > > > -+++ b/rpm.am > > > > -@@ -1,10 +1,10 @@ > > > > - # Internal binaries > > > > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm > > > > --rpmlibexecdir = $(prefix)/lib/rpm > > > > -+rpmlibexecdir = $(libdir)/rpm > > > > - > > > > - # Host independent config files > > > > - ## HACK: it probably should be $(datadir)/rpm > > > > --rpmconfigdir = $(prefix)/lib/rpm > > > > -+rpmconfigdir = $(libdir)/rpm > > > > - > > > > - # Libtool version (current-revision-age) for all our libraries > > > > - rpm_version_info = 13:0:4 > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > > index fda64eefe01..6a18679da2f 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > > @@ -1,35 +1,36 @@ > > > > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 > 2001 > > > > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Tue, 10 Jan 2017 14:11:30 +0200 > > > > Subject: [PATCH] Do not read config files from $HOME > > > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > + > > > > --- > > > > lib/rpmrc.c | 6 ++---- > > > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > > > > > -Index: git/lib/rpmrc.c > > > > -=================================================================== > > > > ---- git.orig/lib/rpmrc.c > > > > -+++ git/lib/rpmrc.c > > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > > > +index 269d490ac..f39dcfc11 100644 > > > > +--- a/lib/rpmrc.c > > > > ++++ b/lib/rpmrc.c > > > > @@ -458,8 +458,7 @@ static void setDefaults(void) > > > > if (!defrcfiles) { > > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > > > - confdir, "/" RPMCANONVENDOR > "/rpmrc", ":", > > > > + confdir, "/" RPM_VENDOR "/rpmrc", > ":", > > > > - SYSCONFDIR "/rpmrc", ":", > > > > - "~/.rpmrc", NULL); > > > > -+ SYSCONFDIR "/rpmrc", ":"); > > > > ++ SYSCONFDIR "/rpmrc", NULL); > > > > } > > > > > > > > #ifndef MACROFILES > > > > @@ -471,8 +470,7 @@ static void setDefaults(void) > > > > - confdir, "/" RPMCANONVENDOR > "/macros", ":", > > > > + confdir, "/" RPM_VENDOR "/macros", > ":", > > > > SYSCONFDIR "/rpm/macros.*", ":", > > > > SYSCONFDIR "/rpm/macros", ":", > > > > - SYSCONFDIR "/rpm/%{_target}/macros", > ":", > > > > - "~/.rpmmacros", NULL); > > > > -+ SYSCONFDIR "/rpm/%{_target}/macros", > ":"); > > > > ++ SYSCONFDIR "/rpm/%{_target}/macros", > NULL); > > > > } > > > > #else > > > > macrofiles = MACROFILES; > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > > index ae24b663aae..318f65ed375 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > > @@ -1,4 +1,4 @@ > > > > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 > 2001 > > > > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Fri, 20 Jan 2017 13:32:06 +0200 > > > > Subject: [PATCH] Do not reset the PATH environment variable before > running > > > > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > > > > lib/rpmscript.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > -Index: git/lib/rpmscript.c > > > > -=================================================================== > > > > ---- git.orig/lib/rpmscript.c > > > > -+++ git/lib/rpmscript.c > > > > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > > +index 36e37cf77..37ada014c 100644 > > > > +--- a/lib/rpmscript.c > > > > ++++ b/lib/rpmscript.c > > > > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, > ARGV_const_t prefixes, > > > > if (ipath && ipath[5] != '%') > > > > path = ipath; > > > > > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > > deleted file mode 100644 > > > > index f9b809d1676..00000000000 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > > +++ /dev/null > > > > @@ -1,40 +0,0 @@ > > > > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 > 2001 > > > > -From: Florian Festi <ffesti@redhat.com> > > > > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > > > > -Subject: [PATCH] Duplicate filename before passing it to basename > > > > - > > > > -basename is allowed change the string passed to it. While we don't > need > > > > -the filename after that just casting away the const seems a bit too > > > > -hacky. > > > > - > > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 > ] > > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > > ---- > > > > - tools/rpmuncompress.c | 4 +++- > > > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > > > - > > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > > > -index 58ddf5683..e13cc6a66 100644 > > > > ---- a/tools/rpmuncompress.c > > > > -+++ b/tools/rpmuncompress.c > > > > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > > > > - if (needtar) { > > > > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, > taropts); > > > > - } else if (at->compressed == COMPRESSED_GEM) { > > > > -- const char *bn = basename(fn); > > > > -+ char *tmp = xstrdup(fn); > > > > -+ const char *bn = basename(tmp); > > > > - size_t nvlen = strlen(bn) - 3; > > > > - char *gem = rpmGetPath("%{__gem}", NULL); > > > > - char *gemspec = NULL; > > > > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > > > > - > > > > - free(gemspec); > > > > - free(gem); > > > > -+ free(tmp); > > > > - } else { > > > > - rasprintf(&buf, "%s '%s'", zipper, fn); > > > > - } > > > > --- > > > > -2.43.0 > > > > - > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > > deleted file mode 100644 > > > > index a93597a8352..00000000000 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > > +++ /dev/null > > > > @@ -1,26 +0,0 @@ > > > > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 > 2001 > > > > -From: Calvin Buckley <calvin@cmpct.info> > > > > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > > > > -Subject: [PATCH] Fix missing basename include on macOS > > > > - > > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d > ] > > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > > ---- > > > > - tools/rpmuncompress.c | 1 + > > > > - 1 file changed, 1 insertion(+) > > > > - > > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > > > -index bd4146d54..58ddf5683 100644 > > > > ---- a/tools/rpmuncompress.c > > > > -+++ b/tools/rpmuncompress.c > > > > -@@ -1,6 +1,7 @@ > > > > - #include "system.h" > > > > - > > > > - #include <popt.h> > > > > -+#include <libgen.h> > > > > - #include <errno.h> > > > > - #include <stdio.h> > > > > - #include <string.h> > > > > --- > > > > -2.43.0 > > > > - > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > > new file mode 100644 > > > > index 00000000000..8e73e077049 > > > > --- /dev/null > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > > @@ -0,0 +1,56 @@ > > > > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 > 2001 > > > > +From: Panu Matilainen <pmatilai@redhat.com> > > > > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > > > > +Subject: [PATCH] Fix unconditional dependency on non-POSIX > GLOB_ONLYDIR flag > > > > + > > > > +This regressed when we axed our internal glob copy in commit > > > > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is > only > > > > +an optimization so we can just skip it if not available. > > > > + > > > > +Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1 > ] > > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > +--- > > > > + CMakeLists.txt | 1 + > > > > + config.h.in | 1 + > > > > + rpmio/rpmglob.c | 2 ++ > > > > + 3 files changed, 4 insertions(+) > > > > + > > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > > +index d0ea565f3..0a474106e 100644 > > > > +--- a/CMakeLists.txt > > > > ++++ b/CMakeLists.txt > > > > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > > > > + set(HAVE_LIBDW 1) > > > > + endif() > > > > + > > > > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > > > > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > > > > + if (NOT MAJOR_IN_SYSMACROS) > > > > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > > > > +diff --git a/config.h.in b/config.h.in > > > > +index cb97827d0..ab1757a9a 100644 > > > > +--- a/config.h.in > > > > ++++ b/config.h.in > > > > +@@ -100,6 +100,7 @@ > > > > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > > > > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > > > > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > > > > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > > > > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > > > > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > > > > + #cmakedefine RUNDIR @rundir@ > > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > > > +index 8276eddb4..243568766 100644 > > > > +--- a/rpmio/rpmglob.c > > > > ++++ b/rpmio/rpmglob.c > > > > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, > rpmglobFlags flags, > > > > + gflags |= GLOB_BRACE; > > > > + if (home != NULL && strlen(home) > 0) > > > > + gflags |= GLOB_TILDE; > > > > ++#if HAVE_GLOB_ONLYDIR > > > > + if (dir_only) > > > > + gflags |= GLOB_ONLYDIR; > > > > ++#endif > > > > + if (flags & RPMGLOB_NOCHECK) > > > > + gflags |= GLOB_NOCHECK; > > > > + > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > > index bd3314a90f8..fc89b44132b 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > > @@ -1,4 +1,4 @@ > > > > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 > 2001 > > > > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Tue, 17 Jan 2017 14:07:17 +0200 > > > > Subject: [PATCH] When cross-installing, execute package scriptlets > without > > > > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson < > olofjn@axis.com>: > > > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > + > > > > --- > > > > lib/rpmscript.c | 11 ++++++++--- > > > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > > > > > -Index: git/lib/rpmscript.c > > > > -=================================================================== > > > > ---- git.orig/lib/rpmscript.c > > > > -+++ git/lib/rpmscript.c > > > > -@@ -18,7 +18,7 @@ > > > > - #include "rpmio/rpmio_internal.h" > > > > - > > > > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > > > > -- > > > > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > > > > - #include "debug.h" > > > > - > > > > - struct scriptNextFileFunc_s { > > > > -@@ -427,8 +427,7 @@ exit: > > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > > +index b18f851a3..36e37cf77 100644 > > > > +--- a/lib/rpmscript.c > > > > ++++ b/lib/rpmscript.c > > > > +@@ -448,8 +448,7 @@ exit: > > > > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > > > > > > > > if (fn) { > > > > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > > > > free(fn); > > > > } > > > > free(mline); > > > > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > > > > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, > int arg2, FD_t scriptFd, > > > > > > > > if (rc != RPMRC_FAIL) { > > > > if (script_type & RPMSCRIPTLET_EXEC) { > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > > index 64433abb6a1..5820b2e7e5b 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > > @@ -1,4 +1,4 @@ > > > > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 > 2001 > > > > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex@linutronix.de> > > > > Date: Tue, 31 Aug 2021 10:37:05 +0200 > > > > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm > metadata > > > > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for > .rpm). > > > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > + > > > > --- > > > > build/pack.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > -Index: git/build/pack.c > > > > -=================================================================== > > > > ---- git.orig/build/pack.c > > > > -+++ git/build/pack.c > > > > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > > > > +diff --git a/build/pack.c b/build/pack.c > > > > +index f382c7da0..0889dd993 100644 > > > > +--- a/build/pack.c > > > > ++++ b/build/pack.c > > > > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > > > > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, > compr); > > > > buf = xstrdup(rpmio_flags); > > > > buf[s - rpmio_flags] = '\0'; > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > > deleted file mode 100644 > > > > index 29b6686a940..00000000000 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > > +++ /dev/null > > > > @@ -1,28 +0,0 @@ > > > > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 > 2001 > > > > -From: Alexander Kanavin <alex@linutronix.de> > > > > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > > > > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet > handling > > > > - > > > > -x32 is a 64 bit x86 ABI with 32 bit pointers. > > > > - > > > > -Upstream-Status: Submitted [ > https://github.com/rpm-software-management/rpm/pull/2143] > > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > ---- > > > > - configure.ac | 4 ++++ > > > > - 1 file changed, 4 insertions(+) > > > > - > > > > -Index: git/configure.ac > > > > -=================================================================== > > > > ---- git.orig/configure.ac > > > > -+++ git/configure.ac > > > > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > > > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > > > - host_os_gnu=-gnux32 > > > > - fi > > > > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > > > > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > > > -+ host_os_gnu=-gnux32 > > > > -+fi > > > > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > > > > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > > > > - fi > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > > index 82e6567dc74..8b9f1f72944 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > > @@ -1,4 +1,4 @@ > > > > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 > 2001 > > > > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 > 2001 > > > > From: Changqing Li <changqing.li@windriver.com> > > > > Date: Thu, 7 May 2020 17:40:58 +0800 > > > > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 > N32 > > > > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution > when "neither is preferred". > > > > Upstream-Status: Submitted < > https://github.com/rpm-software-management/rpm/issues/193> > > > > > > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > > > > + > > > > --- > > > > lib/transaction.c | 13 ++++++++++++- > > > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > > > > > -Index: git/lib/transaction.c > > > > -=================================================================== > > > > ---- git.orig/lib/transaction.c > > > > -+++ git/lib/transaction.c > > > > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > > > > +diff --git a/lib/transaction.c b/lib/transaction.c > > > > +index 70d2587ac..b89b30060 100644 > > > > +--- a/lib/transaction.c > > > > ++++ b/lib/transaction.c > > > > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > > > > rpmfsSetAction(ofs, ofx, FA_CREATE); > > > > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > > > > rConflicts = 0; > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > > index a6c58699d36..388694d234f 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > > @@ -1,4 +1,7 @@ > > > > -perl: disable auto requires > > > > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 > 2001 > > > > +From: Mark Hatle <mark.hatle@windriver.com> > > > > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > > > > +Subject: [PATCH] perl: disable auto requires > > > > > > > > When generating automatic requirements, it's possible for perl > scripts to > > > > declare 'optional' dependencies. These seem to often be incorrect > and will > > > > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific > configuration] > > > > > > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > > > > > > > -Index: git/fileattrs/perl.attr > > > > -=================================================================== > > > > ---- git.orig/fileattrs/perl.attr > > > > -+++ git/fileattrs/perl.attr > > > > +--- > > > > + fileattrs/perl.attr | 2 +- > > > > + fileattrs/perllib.attr | 2 +- > > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > > + > > > > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > > > > +index 0daef58d5..81ddf5305 100644 > > > > +--- a/fileattrs/perl.attr > > > > ++++ b/fileattrs/perl.attr > > > > @@ -1,3 +1,3 @@ > > > > -%__perl_requires %{_rpmconfigdir}/perl.req > > > > +#__perl_requires %{_rpmconfigdir}/perl.req > > > > %__perl_magic ^.*[Pp]erl .*$ > > > > %__perl_flags exeonly > > > > -Index: git/fileattrs/perllib.attr > > > > -=================================================================== > > > > ---- git.orig/fileattrs/perllib.attr > > > > -+++ git/fileattrs/perllib.attr > > > > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > > > > +index fcad48099..495a28927 100644 > > > > +--- a/fileattrs/perllib.attr > > > > ++++ b/fileattrs/perllib.attr > > > > @@ -1,5 +1,5 @@ > > > > %__perllib_provides %{_rpmconfigdir}/perl.prov > > > > -%__perllib_requires %{_rpmconfigdir}/perl.req > > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > > deleted file mode 100644 > > > > index d0e637191a8..00000000000 > > > > --- > a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > > +++ /dev/null > > > > @@ -1,35 +0,0 @@ > > > > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 > 2001 > > > > -From: Khem Raj <raj.khem@gmail.com> > > > > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > > > > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash > > > > - > > > > -Fixes > > > > -python/header-py.c:744:2: error: incompatible function pointer > types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an > expression of type 'long (PyObject *)' (aka 'long (struct _object *)') > [-Wincompatible-function-pointer-types] > > > > -| hdr_hash, /* tp_hash */ > > > > -| ^~~~~~~~ > > > > - > > > > -Upstream-Status: Submitted [ > https://github.com/rpm-software-management/rpm/pull/2409] > > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > > ---- > > > > - python/header-py.c | 4 ++-- > > > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > > > - > > > > -diff --git a/python/header-py.c b/python/header-py.c > > > > -index 0aed0c9267..c15503f359 100644 > > > > ---- a/python/header-py.c > > > > -+++ b/python/header-py.c > > > > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) > > > > - "(Oi)", s, RPMTAG_NEVR); > > > > - } > > > > - > > > > --static long hdr_hash(PyObject * h) > > > > -+static Py_hash_t hdr_hash(PyObject * h) > > > > - { > > > > -- return (long) h; > > > > -+ return (Py_hash_t) h; > > > > - } > > > > - > > > > - static PyObject * hdr_reduce(hdrObject *s) > > > > --- > > > > -2.39.2 > > > > - > > > > diff --git > a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > > index 2fe96a839c3..89c23f81975 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > > @@ -1,7 +1,7 @@ > > > > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 > 2001 > > > > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Fri, 20 Jan 2017 13:33:05 +0200 > > > > -Subject: [PATCH 2/2] Add support for prefixing /etc from > RPM_ETCCONFIGDIR > > > > +Subject: [PATCH] Add support for prefixing /etc from > RPM_ETCCONFIGDIR > > > > environment variable > > > > > > > > This is needed so that rpm can pick up target-specific configuration > > > > @@ -9,15 +9,16 @@ from target rootfs instead of its own native > sysroot. > > > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > + > > > > --- > > > > lib/rpmrc.c | 19 ++++++++++++++----- > > > > 1 file changed, 14 insertions(+), 5 deletions(-) > > > > > > > > -Index: git/lib/rpmrc.c > > > > -=================================================================== > > > > ---- git.orig/lib/rpmrc.c > > > > -+++ git/lib/rpmrc.c > > > > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > > > +index f39dcfc11..f27f88753 100644 > > > > +--- a/lib/rpmrc.c > > > > ++++ b/lib/rpmrc.c > > > > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char > * name, > > > > static void setDefaults(void) > > > > { > > > > const char *confdir = rpmConfigDir(); > > > > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > > > > + > > > > if (!defrcfiles) { > > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > > > - confdir, "/" RPMCANONVENDOR > "/rpmrc", ":", > > > > -- SYSCONFDIR "/rpmrc", ":"); > > > > -+ etcconfdir, SYSCONFDIR "/rpmrc", > ":", NULL); > > > > + confdir, "/" RPM_VENDOR "/rpmrc", > ":", > > > > +- SYSCONFDIR "/rpmrc", NULL); > > > > ++ etcconfdir, SYSCONFDIR "/rpmrc", > NULL); > > > > } > > > > > > > > #ifndef MACROFILES > > > > @@ -468,9 +472,9 @@ static void setDefaults(void) > > > > confdir, > "/platform/%{_target}/macros", ":", > > > > confdir, "/fileattrs/*.attr", ":", > > > > - confdir, "/" RPMCANONVENDOR > "/macros", ":", > > > > + confdir, "/" RPM_VENDOR "/macros", > ":", > > > > - SYSCONFDIR "/rpm/macros.*", ":", > > > > - SYSCONFDIR "/rpm/macros", ":", > > > > -- SYSCONFDIR "/rpm/%{_target}/macros", > ":"); > > > > +- SYSCONFDIR "/rpm/%{_target}/macros", > NULL); > > > > + etcconfdir, SYSCONFDIR > "/rpm/macros.*", ":", > > > > + etcconfdir, SYSCONFDIR > "/rpm/macros", ":", > > > > -+ etcconfdir, SYSCONFDIR > "/rpm/%{_target}/macros", ":", NULL); > > > > ++ etcconfdir, SYSCONFDIR > "/rpm/%{_target}/macros", NULL); > > > > } > > > > #else > > > > macrofiles = MACROFILES; > > > > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > > > > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > > > > */ > > > > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const > char ** os) > > > > { > > > > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > > > > static struct utsname un; > > > > char * chptr; > > > > canonEntry canon; > > > > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > > > > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, > const char ** arch, const char ** os) > > > > > > > > if (arch) *arch = un.machine; > > > > if (os) *os = un.sysname; > > > > diff --git > a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > > new file mode 100644 > > > > index 00000000000..e7f0adc70c9 > > > > --- /dev/null > > > > +++ > b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > > @@ -0,0 +1,26 @@ > > > > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 > 2001 > > > > +From: Alexander Kanavin <alex@linutronix.de> > > > > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > > > > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent > docs/html > > > > + > > > > +Building html would require doxygen-native. > > > > + > > > > +Upstream-Status: Inappropriate [oe-core specific] > > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > + > > > > +--- > > > > + docs/CMakeLists.txt | 1 - > > > > + 1 file changed, 1 deletion(-) > > > > + > > > > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > > > > +index 52dce7b4e..c01ff7757 100644 > > > > +--- a/docs/CMakeLists.txt > > > > ++++ b/docs/CMakeLists.txt > > > > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > > > > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > > > > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > > > > + endif() > > > > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION > ${CMAKE_INSTALL_DOCDIR}/API) > > > > + > > > > + install(FILES > > > > + README.md > > > > diff --git > a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > > new file mode 100644 > > > > index 00000000000..3d4b09bedb6 > > > > --- /dev/null > > > > +++ > b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > > @@ -0,0 +1,34 @@ > > > > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 > 2001 > > > > +From: Alexander Kanavin <alex@linutronix.de> > > > > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > > > > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if > undefined by C > > > > + library > > > > + > > > > +This addresses musl failures; if there is code out there relying on > > > > +those braces, it needs to be fixed when used on musl. > > > > + > > > > +This is unlikely to be trivially fixable upstream. > > > > + > > > > +Upstream-Status: Inappropriate [reported at > https://github.com/rpm-software-management/rpm/issues/2844] > > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > +--- > > > > + rpmio/rpmglob.c | 6 ++++++ > > > > + 1 file changed, 6 insertions(+) > > > > + > > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > > > +index 243568766..43c27074a 100644 > > > > +--- a/rpmio/rpmglob.c > > > > ++++ b/rpmio/rpmglob.c > > > > +@@ -33,6 +33,12 @@ > > > > + > > > > + #include "debug.h" > > > > + > > > > ++/* Don't fail if the standard C library > > > > +++ * doesn't provide brace expansion */ > > > > ++#ifndef GLOB_BRACE > > > > ++#define GLOB_BRACE 0 > > > > ++#endif > > > > ++ > > > > + /* Return 1 if pattern contains a magic char, see glob(7) for a > list */ > > > > + static int ismagic(const char *pattern) > > > > + { > > > > diff --git > a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > > index 9dbe7125ded..b3d57cc8703 100644 > > > > --- > a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > > +++ > b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > > @@ -1,4 +1,4 @@ > > > > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 > 2001 > > > > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 > 2001 > > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > Date: Thu, 10 Jan 2019 18:14:18 +0100 > > > > Subject: [PATCH] rpmscript.c: change logging level around > scriptlets to INFO > > > > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > > > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > + > > > > --- > > > > lib/rpmscript.c | 8 ++++---- > > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > > > -Index: git/lib/rpmscript.c > > > > -=================================================================== > > > > ---- git.orig/lib/rpmscript.c > > > > -+++ git/lib/rpmscript.c > > > > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > > +index 37ada014c..bab0c97a6 100644 > > > > +--- a/lib/rpmscript.c > > > > ++++ b/lib/rpmscript.c > > > > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, > const char *script) > > > > if (Ferror(fd)) > > > > goto exit; > > > > > > > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > > > > static const char set_x[] = "set -x\n"; > > > > /* Assume failures will be caught by the write below */ > > > > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > > > > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, > ARGV_const_t prefixes, > > > > char *mline = NULL; > > > > rpmRC rc = RPMRC_FAIL; > > > > > > > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > > > > > > > > if (script) { > > > > fn = writeScript(*argvp[0], script); > > > > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, > ARGV_const_t prefixes, > > > > sname, strerror(errno)); > > > > goto exit; > > > > } else if (pid == 0) {/* Child */ > > > > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > > > > sname, *argvp[0], (unsigned)getpid()); > > > > > > > > fclose(in); > > > > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, > ARGV_const_t prefixes, > > > > reaped = waitpid(pid, &status, 0); > > > > } while (reaped == -1 && errno == EINTR); > > > > > > > > diff --git > a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > > deleted file mode 100644 > > > > index 470dda1dcfb..00000000000 > > > > --- > a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > > +++ /dev/null > > > > @@ -1,51 +0,0 @@ > > > > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 > 2001 > > > > -From: Panu Matilainen <pmatilai@redhat.com> > > > > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > > > > -Subject: [PATCH] Don't muck with per-process global sqlite > configuration from > > > > - the db backend > > > > - > > > > -sqlite3_config() affects all in-process uses of sqlite. librpm > being a > > > > -low-level library, it has no business whatsoever making such > decisions > > > > -for the applications running on top of it. Besides that, the > callback can > > > > -easily end up pointing to an already closed database, causing an > > > > -innocent API user to crash in librpm on an entirely unrelated error > on > > > > -some other database. "Oops." > > > > - > > > > -The sqlite API doesn't seem to provide any per-db or non-global > context > > > > -for logging errors, thus we can only remove the call and let sqlite > output > > > > -errors the way it pleases (print through stderr, presumably). > > > > - > > > > -Thanks to Jan Palus for spotting and reporting! > > > > - > > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e > ] > > > > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > > > > ---- > > > > - lib/backend/sqlite.c | 8 -------- > > > > - 1 file changed, 8 deletions(-) > > > > - > > > > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > > > > -index 5a029d575a..b612732267 100644 > > > > ---- a/lib/backend/sqlite.c > > > > -+++ b/lib/backend/sqlite.c > > > > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, > int argc, sqlite3_value **argv) > > > > - sqlite3_result_int(sctx, match); > > > > - } > > > > - > > > > --static void errCb(void *data, int err, const char *msg) > > > > --{ > > > > -- rpmdb rdb = data; > > > > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > > > > -- rdb->db_descr, sqlite3_errstr(err), msg); > > > > --} > > > > -- > > > > - static int dbiCursorReset(dbiCursor dbc) > > > > - { > > > > - if (dbc->stmt) { > > > > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * > dbhome) > > > > - * the "database is locked" errors at every cost > > > > - */ > > > > - sqlite3_busy_timeout(sdb, 10000); > > > > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > > > > - > > > > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > > > > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > > > > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch > b/meta/recipes-devtools/rpm/files/fix-declaration.patch > > > > deleted file mode 100644 > > > > index e5c84ebd498..00000000000 > > > > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > > > > +++ /dev/null > > > > @@ -1,39 +0,0 @@ > > > > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 > 2001 > > > > -From: Florian Festi <ffesti@redhat.com> > > > > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > > > > -Subject: [PATCH] Fix compiler error on clang > > > > - > > > > -Turns out variable declarations are not allowed after a label, even > in > > > > -C99. And while some compilers don't seem to care others do. > > > > - > > > > -Moving the declaration of mayopen to the start of the function to > avoid > > > > -this problem. > > > > - > > > > -Resolves: #2435 > > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414 > ] > > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > > ---- > > > > - lib/fsm.c | 3 ++- > > > > - 1 file changed, 2 insertions(+), 1 deletion(-) > > > > - > > > > -diff --git a/lib/fsm.c b/lib/fsm.c > > > > -index 5671ac642d..183293edb0 100644 > > > > ---- a/lib/fsm.c > > > > -+++ b/lib/fsm.c > > > > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, > rpmfiles files, > > > > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? > 1 : 0; > > > > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; > > > > - int firstlinkfile = -1; > > > > -+ int mayopen = 0; > > > > - char *tid = NULL; > > > > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > > > > - struct filedata_s *firstlink = NULL; > > > > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte > te, rpmfiles files, > > > > - > > > > - setmeta: > > > > - /* Special files require path-based ops */ > > > > -- int mayopen = S_ISREG(fp->sb.st_mode) || > S_ISDIR(fp->sb.st_mode); > > > > -+ mayopen = S_ISREG(fp->sb.st_mode) || > S_ISDIR(fp->sb.st_mode); > > > > - if (!rc && fd == -1 && mayopen) { > > > > - int flags = O_RDONLY; > > > > - /* Only follow safe symlinks, and never on temporary > files */ > > > > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > > similarity index 72% > > > > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > > > > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > > index 3e85cbb8efe..af11dec5ef3 100644 > > > > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > > > > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > > > > LICENSE = "GPL-2.0-only" > > > > LIC_FILES_CHKSUM = > "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > > > > > > > > -SRC_URI = "git:// > github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > > > > +SRC_URI = "git:// > github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > > > > @@ -36,58 +36,51 @@ SRC_URI = "git:// > github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > > > > > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > > > > > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > > > > > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > > > > - > file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > > > > - > file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > > > > - file://fix-declaration.patch \ > > > > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ > > > > - > file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > > > > - file://0001-Fix-missing-basename-include-on-macOS.patch \ > > > > + > file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > > > > + > file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > > > > + > file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > > > > + > file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > > > > + > file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > > > > " > > > > > > > > PE = "1" > > > > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > > > > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > > > > > > > > S = "${WORKDIR}/git" > > > > > > > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > > > > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 > sqlite3 zstd" > > > > DEPENDS:append:class-native = " file-replacement-native > bzip2-replacement-native" > > > > > > > > -inherit autotools gettext pkgconfig python3native > > > > -export PYTHON_ABI > > > > - > > > > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > > > > - > > > > -# OE-core patches autoreconf to additionally run gnu-configize, > which fails with this recipe > > > > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > > > > - > > > > -# Vendor is detected differently on x86 and aarch64 hosts and can > feed into target packages > > > > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt > --with-vendor=pc" > > > > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > > > > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF > -DENABLE_OPENMP=OFF" > > > > > > > > # --sysconfdir prevents rpm from attempting to access > machine-specific configuration in sysroot/etc; we need to have it in rootfs > > > > # --localstatedir prevents rpm from writing its database to native > sysroot when building images > > > > -# Forcibly disable plugins for native/nativesdk, as the inhibit and > prioreset > > > > -# plugins both behave badly inside builds. > > > > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc > --localstatedir=/var --disable-plugins" > > > > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc > --disable-plugins" > > > > +EXTRA_OECMAKE:append:class-native = " > -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc > -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > > > > +EXTRA_OECMAKE:append:class-nativesdk = " > -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > > > > + > > > > +inherit cmake gettext pkgconfig python3targetconfig > > > > +OECMAKE_GENERATOR = "Unix Makefiles" > > > > > > > > BBCLASSEXTEND = "native nativesdk" > > > > > > > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', > 'systemd', 'inhibit', '', d)} sqlite zstd" > > > > -# The inhibit plugin serves no purpose outside of the target > > > > -PACKAGECONFIG:remove:class-native = "inhibit" > > > > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > > > > +PACKAGECONFIG ??= "internal-openpgp" > > > > > > > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > > > > -PACKAGECONFIG[inhibit] = > "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > > > > -PACKAGECONFIG[rpm2archive] = > "--with-archive,--without-archive,libarchive" > > > > -PACKAGECONFIG[sqlite] = > "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > > > > -PACKAGECONFIG[readline] = > "--with-readline,--without-readline,readline" > > > > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > > > > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > > > > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > > > > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > > > > +PACKAGECONFIG[testsuite] = > "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > > > > > > > > -ASNEEDED = "" > > > > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > > > > +PACKAGECONFIG[internal-openpgp] = > "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > > > > + > > > > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > > > > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > > > > +PACKAGECONFIG[archive] = > "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > > > > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > > > > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > > > > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > > > > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > > > > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > > > > +PACKAGECONFIG[fapolicyd] = > "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > > > > +PACKAGECONFIG[readline] = > "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > > > > > > > > # Direct rpm-native to read configuration from our sysroot, not the > one it was compiled in > > > > # libmagic also has sysroot path contamination, so override it > > > > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > > > > ${libdir}/rpm/rpmdeps \ > > > > " > > > > > > > > -do_configure:prepend() { > > > > - mkdir -p ${S}/build-aux > > > > -} > > > > - > > > > do_install:append:class-native() { > > > > for tool in ${WRAPPER_TOOLS}; do > > > > test -x ${D}$tool && create_wrapper ${D}$tool \ > > > > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > > > > > > > > do_install:append () { > > > > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > > > > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > > > > ${D}/${libdir}/rpm/macros > > > > > > > > } > > > > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > > > > ${libdir}/rpm/check-* \ > > > > ${libdir}/rpm/sepdebugcrcfix \ > > > > ${libdir}/rpm/find-lang.sh \ > > > > + ${libdir}/rpm/sysusers.sh \ > > > > ${libdir}/rpm/*provides* \ > > > > ${libdir}/rpm/*requires* \ > > > > ${libdir}/rpm/*deps* \ > > > > -- > > > > 2.39.2 > > > > > > > > > > > > > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#194457): > https://lists.openembedded.org/g/openembedded-core/message/194457 > Mute This Topic: https://lists.openembedded.org/mt/103975822/3618418 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub > [matt@madison.systems] > -=-=-=-=-=-=-=-=-=-=-=- > > [-- Attachment #2: Type: text/html, Size: 91475 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-29 12:11 ` Matt Madison @ 2024-01-29 12:22 ` Alexander Kanavin 2024-01-29 16:30 ` Matt Madison 0 siblings, 1 reply; 20+ messages in thread From: Alexander Kanavin @ 2024-01-29 12:22 UTC (permalink / raw) To: Matt Madison; +Cc: Khem Raj, openembedded-core I guess the proper fix should be in pseudo? Alex On Mon, 29 Jan 2024 at 13:11, Matt Madison <matt@madison.systems> wrote: > > I ran across a different failure due to the rpm upgrade, which I've traced to this change: > > https://github.com/rpm-software-management/rpm/commit/162110aadad445cc248a68dc4c840fe05b79d00f > > This is enabling 64-bit filesystem calls in the rpm-native build, causing it to use statvfs64() instead of statvfs(). Pseudo doesn't handle statvfs64(), so when rpm checks available disk space, it's looking at the host system's rootfs instead of the disk where the build is happening. I'm not sure whether pseudo needs an update, or whether the hard-coded define added by the above-mentioned commit should be turned off for -native builds. > > Regards, > -Matt > > On Mon, Jan 29, 2024 at 3:57 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: >> >> I sent a patch. >> >> Alex >> >> On Sun, 28 Jan 2024 at 20:04, Alexander Kanavin via >> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> >> wrote: >> > >> > 0257: file = file.replace("%", "%%%%%%%%") >> > *** 0258: attr = get_attr(file) >> > ... >> > *** 0203: stat_f = os.stat(rootpath + "/" + path, >> > follow_symlinks=False) >> > >> > Exception: FileNotFoundError: [Errno 2] No such file or directory: >> > '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/nodejs/20.8.1/packages-split/nodejs-ptest/usr/lib/nodejs/ptest/test/fixtures/es-modules/test-esm-double-encoding-native%%%%%%%%20.mjs' >> > >> > Seems like 257 and 258 should be swapped. No idea what that % >> > replacement is for. >> > >> > Alex >> > >> > On Sun, 28 Jan 2024 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: >> > > >> > > I am seeing some failures in meta-oe ( especially nodejs ) which I >> > > suspect are due to rpm upgrade and patches around it. >> > > >> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio >> > > >> > > On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin >> > > <alex.kanavin@gmail.com> wrote: >> > > > >> > > > Upstream has replaced autoconf with cmake, which necessitates a rewrite of the >> > > > recipe and available options, and a rebase to cmake of >> > > > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >> > > > >> > > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : >> > > > the patch was removing the NULL marker at the end of function arguments, >> > > > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >> > > > was restoring it (in addition to the actual change the patch was making). >> > > > Now both patches preserve the NULL terminator. >> > > > >> > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > --- >> > > > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- >> > > > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ >> > > > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ >> > > > ...satisfiable-dependency-when-building.patch | 12 +-- >> > > > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- >> > > > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- >> > > > ...-PATH-environment-variable-before-ru.patch | 12 +-- >> > > > ...lename-before-passing-it-to-basename.patch | 40 ---------- >> > > > ...ix-missing-basename-include-on-macOS.patch | 26 ------- >> > > > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ >> > > > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- >> > > > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- >> > > > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- >> > > > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- >> > > > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- >> > > > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- >> > > > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- >> > > > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ >> > > > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ >> > > > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- >> > > > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- >> > > > .../rpm/files/fix-declaration.patch | 39 ---------- >> > > > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- >> > > > 23 files changed, 328 insertions(+), 383 deletions(-) >> > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch >> > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch >> > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch >> > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch >> > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch >> > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch >> > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch >> > > > create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch >> > > > create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch >> > > > delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch >> > > > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch >> > > > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) >> > > > >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch >> > > > index 9fa486dfd3c..96fe57dfeb8 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 >> > > > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Thu, 9 Mar 2017 18:54:02 +0200 >> > > > Subject: [PATCH] Add a color setting for mips64_n32 binaries >> > > > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > 2 files changed, 6 insertions(+) >> > > > >> > > > diff --git a/build/rpmfc.c b/build/rpmfc.c >> > > > -index 26606378f..a16e3f4e9 100644 >> > > > +index 4b67a9bae..ed7e4e623 100644 >> > > > --- a/build/rpmfc.c >> > > > +++ b/build/rpmfc.c >> > > > -@@ -646,6 +646,7 @@ exit: >> > > > +@@ -660,6 +660,7 @@ exit: >> > > > static const struct rpmfcTokens_s rpmfcTokens[] = { >> > > > { "directory", RPMFC_INCLUDE }, >> > > > >> > > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 >> > > > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, >> > > > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, >> > > > >> > > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) >> > > > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) >> > > > color = RPMFC_ELF32; >> > > > break; >> > > > } >> > > > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 >> > > > if (elf) >> > > > elf_end(elf); >> > > > diff --git a/rpmrc.in b/rpmrc.in >> > > > -index 2975a3a0e..c7232b48b 100644 >> > > > +index 8646a966b..7349fdfd3 100644 >> > > > --- a/rpmrc.in >> > > > +++ b/rpmrc.in >> > > > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 >> > > > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 >> > > > archcolor: mips64r6 2 >> > > > archcolor: mips64r6el 2 >> > > > >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch >> > > > new file mode 100644 >> > > > index 00000000000..5053caae33f >> > > > --- /dev/null >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch >> > > > @@ -0,0 +1,28 @@ >> > > > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 >> > > > +From: Alexander Kanavin <alex@linutronix.de> >> > > > +Date: Wed, 29 Nov 2023 14:06:15 +0100 >> > > > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than >> > > > + cmake modules >> > > > + >> > > > +Otherwise cmake will try to find libm, badly, and fail. >> > > > + >> > > > +Upstream-Status: Inappropriate [oe-core specific] >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > + >> > > > +--- >> > > > + CMakeLists.txt | 2 +- >> > > > + 1 file changed, 1 insertion(+), 1 deletion(-) >> > > > + >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt >> > > > +index 7f0630453..d0ea565f3 100644 >> > > > +--- a/CMakeLists.txt >> > > > ++++ b/CMakeLists.txt >> > > > +@@ -187,7 +187,7 @@ set(REQFUNCS >> > > > + ) >> > > > + >> > > > + find_package(PkgConfig REQUIRED) >> > > > +-find_package(Lua 5.2 REQUIRED) >> > > > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) >> > > > + find_package(ZLIB REQUIRED) >> > > > + find_package(BZip2) >> > > > + find_package(Iconv) >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch >> > > > new file mode 100644 >> > > > index 00000000000..db83b176b41 >> > > > --- /dev/null >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch >> > > > @@ -0,0 +1,42 @@ >> > > > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 >> > > > +From: Alexander Kanavin <alex@linutronix.de> >> > > > +Date: Tue, 16 Jan 2024 13:43:36 +0100 >> > > > +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit >> > > > + option >> > > > + >> > > > +This was lost in autotools -> cmake transition. The particular >> > > > +reason to make it explicit is that readline is gpl version 3 >> > > > +licensed, and in some builds components under that license >> > > > +need to be excluded. >> > > > + >> > > > +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > +--- >> > > > + CMakeLists.txt | 7 ++++++- >> > > > + 1 file changed, 6 insertions(+), 1 deletion(-) >> > > > + >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt >> > > > +index 0a474106e..89e27417f 100644 >> > > > +--- a/CMakeLists.txt >> > > > ++++ b/CMakeLists.txt >> > > > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) >> > > > + option(WITH_FSVERITY "Build with fsverity support" OFF) >> > > > + option(WITH_IMAEVM "Build with IMA support" OFF) >> > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) >> > > > ++option(WITH_READLINE "Build with readline support" ON) >> > > > + >> > > > + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") >> > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") >> > > > +@@ -193,7 +194,11 @@ find_package(BZip2) >> > > > + find_package(Iconv) >> > > > + >> > > > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) >> > > > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) >> > > > ++ >> > > > ++if (WITH_READLINE) >> > > > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) >> > > > ++endif() >> > > > ++ >> > > > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) >> > > > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) >> > > > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch >> > > > index 8440c3516d6..df5543873c1 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 >> > > > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Mon, 9 Jan 2017 18:52:11 +0200 >> > > > Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in >> > > > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > build/pack.c | 4 ---- >> > > > 1 file changed, 4 deletions(-) >> > > > >> > > > -Index: git/build/pack.c >> > > > -=================================================================== >> > > > ---- git.orig/build/pack.c >> > > > -+++ git/build/pack.c >> > > > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, >> > > > +diff --git a/build/pack.c b/build/pack.c >> > > > +index f7dac6d9a..f382c7da0 100644 >> > > > +--- a/build/pack.c >> > > > ++++ b/build/pack.c >> > > > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch >> > > > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); >> > > > } >> > > > >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >> > > > index 8fdc5edb10b..b056d19741a 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 >> > > > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Mon, 27 Feb 2017 09:43:30 +0200 >> > > > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for >> > > > @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > >> > > > --- >> > > > - configure.ac | 2 +- >> > > > - macros.in | 2 +- >> > > > - rpm.am | 4 ++-- >> > > > - 3 files changed, 4 insertions(+), 4 deletions(-) >> > > > + CMakeLists.txt | 2 +- >> > > > + macros.in | 2 +- >> > > > + 2 files changed, 2 insertions(+), 2 deletions(-) >> > > > >> > > > -diff --git a/configure.ac b/configure.ac >> > > > -index e6676c581..ec28db9b6 100644 >> > > > ---- a/configure.ac >> > > > -+++ b/configure.ac >> > > > -@@ -942,7 +942,7 @@ else >> > > > - usrprefix=$prefix >> > > > - fi >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt >> > > > +index 2767915fb..7f0630453 100644 >> > > > +--- a/CMakeLists.txt >> > > > ++++ b/CMakeLists.txt >> > > > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) >> > > > + option(WITH_IMAEVM "Build with IMA support" OFF) >> > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) >> > > > >> > > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" >> > > > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" >> > > > - AC_SUBST(RPMCONFIGDIR) >> > > > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") >> > > > ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") >> > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") >> > > > >> > > > - AC_SUBST(OBJDUMP) >> > > > + # Emulate libtool versioning. Before a public release: >> > > > diff --git a/macros.in b/macros.in >> > > > -index a2411d784..735b74d99 100644 >> > > > +index b49ffaad4..3acbe78f6 100644 >> > > > --- a/macros.in >> > > > +++ b/macros.in >> > > > -@@ -930,7 +930,7 @@ package or when debugging this package.\ >> > > > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ >> > > > %_sharedstatedir %{_prefix}/com >> > > > %_localstatedir %{_prefix}/var >> > > > %_lib lib >> > > > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 >> > > > %_includedir %{_prefix}/include >> > > > %_infodir %{_datadir}/info >> > > > %_mandir %{_datadir}/man >> > > > -diff --git a/rpm.am b/rpm.am >> > > > -index 55b5b3935..5a51f102b 100644 >> > > > ---- a/rpm.am >> > > > -+++ b/rpm.am >> > > > -@@ -1,10 +1,10 @@ >> > > > - # Internal binaries >> > > > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm >> > > > --rpmlibexecdir = $(prefix)/lib/rpm >> > > > -+rpmlibexecdir = $(libdir)/rpm >> > > > - >> > > > - # Host independent config files >> > > > - ## HACK: it probably should be $(datadir)/rpm >> > > > --rpmconfigdir = $(prefix)/lib/rpm >> > > > -+rpmconfigdir = $(libdir)/rpm >> > > > - >> > > > - # Libtool version (current-revision-age) for all our libraries >> > > > - rpm_version_info = 13:0:4 >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch >> > > > index fda64eefe01..6a18679da2f 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch >> > > > @@ -1,35 +1,36 @@ >> > > > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 >> > > > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Tue, 10 Jan 2017 14:11:30 +0200 >> > > > Subject: [PATCH] Do not read config files from $HOME >> > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > + >> > > > --- >> > > > lib/rpmrc.c | 6 ++---- >> > > > 1 file changed, 2 insertions(+), 4 deletions(-) >> > > > >> > > > -Index: git/lib/rpmrc.c >> > > > -=================================================================== >> > > > ---- git.orig/lib/rpmrc.c >> > > > -+++ git/lib/rpmrc.c >> > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c >> > > > +index 269d490ac..f39dcfc11 100644 >> > > > +--- a/lib/rpmrc.c >> > > > ++++ b/lib/rpmrc.c >> > > > @@ -458,8 +458,7 @@ static void setDefaults(void) >> > > > if (!defrcfiles) { >> > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", >> > > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", >> > > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", >> > > > - SYSCONFDIR "/rpmrc", ":", >> > > > - "~/.rpmrc", NULL); >> > > > -+ SYSCONFDIR "/rpmrc", ":"); >> > > > ++ SYSCONFDIR "/rpmrc", NULL); >> > > > } >> > > > >> > > > #ifndef MACROFILES >> > > > @@ -471,8 +470,7 @@ static void setDefaults(void) >> > > > - confdir, "/" RPMCANONVENDOR "/macros", ":", >> > > > + confdir, "/" RPM_VENDOR "/macros", ":", >> > > > SYSCONFDIR "/rpm/macros.*", ":", >> > > > SYSCONFDIR "/rpm/macros", ":", >> > > > - SYSCONFDIR "/rpm/%{_target}/macros", ":", >> > > > - "~/.rpmmacros", NULL); >> > > > -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); >> > > > ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); >> > > > } >> > > > #else >> > > > macrofiles = MACROFILES; >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch >> > > > index ae24b663aae..318f65ed375 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 >> > > > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Fri, 20 Jan 2017 13:32:06 +0200 >> > > > Subject: [PATCH] Do not reset the PATH environment variable before running >> > > > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > lib/rpmscript.c | 2 +- >> > > > 1 file changed, 1 insertion(+), 1 deletion(-) >> > > > >> > > > -Index: git/lib/rpmscript.c >> > > > -=================================================================== >> > > > ---- git.orig/lib/rpmscript.c >> > > > -+++ git/lib/rpmscript.c >> > > > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar >> > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c >> > > > +index 36e37cf77..37ada014c 100644 >> > > > +--- a/lib/rpmscript.c >> > > > ++++ b/lib/rpmscript.c >> > > > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, >> > > > if (ipath && ipath[5] != '%') >> > > > path = ipath; >> > > > >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch >> > > > deleted file mode 100644 >> > > > index f9b809d1676..00000000000 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch >> > > > +++ /dev/null >> > > > @@ -1,40 +0,0 @@ >> > > > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 >> > > > -From: Florian Festi <ffesti@redhat.com> >> > > > -Date: Wed, 26 Jul 2023 15:01:35 +0200 >> > > > -Subject: [PATCH] Duplicate filename before passing it to basename >> > > > - >> > > > -basename is allowed change the string passed to it. While we don't need >> > > > -the filename after that just casting away the const seems a bit too >> > > > -hacky. >> > > > - >> > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] >> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> >> > > > ---- >> > > > - tools/rpmuncompress.c | 4 +++- >> > > > - 1 file changed, 3 insertions(+), 1 deletion(-) >> > > > - >> > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c >> > > > -index 58ddf5683..e13cc6a66 100644 >> > > > ---- a/tools/rpmuncompress.c >> > > > -+++ b/tools/rpmuncompress.c >> > > > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) >> > > > - if (needtar) { >> > > > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); >> > > > - } else if (at->compressed == COMPRESSED_GEM) { >> > > > -- const char *bn = basename(fn); >> > > > -+ char *tmp = xstrdup(fn); >> > > > -+ const char *bn = basename(tmp); >> > > > - size_t nvlen = strlen(bn) - 3; >> > > > - char *gem = rpmGetPath("%{__gem}", NULL); >> > > > - char *gemspec = NULL; >> > > > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) >> > > > - >> > > > - free(gemspec); >> > > > - free(gem); >> > > > -+ free(tmp); >> > > > - } else { >> > > > - rasprintf(&buf, "%s '%s'", zipper, fn); >> > > > - } >> > > > --- >> > > > -2.43.0 >> > > > - >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch >> > > > deleted file mode 100644 >> > > > index a93597a8352..00000000000 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch >> > > > +++ /dev/null >> > > > @@ -1,26 +0,0 @@ >> > > > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 >> > > > -From: Calvin Buckley <calvin@cmpct.info> >> > > > -Date: Tue, 11 Jul 2023 19:22:41 -0300 >> > > > -Subject: [PATCH] Fix missing basename include on macOS >> > > > - >> > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] >> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> >> > > > ---- >> > > > - tools/rpmuncompress.c | 1 + >> > > > - 1 file changed, 1 insertion(+) >> > > > - >> > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c >> > > > -index bd4146d54..58ddf5683 100644 >> > > > ---- a/tools/rpmuncompress.c >> > > > -+++ b/tools/rpmuncompress.c >> > > > -@@ -1,6 +1,7 @@ >> > > > - #include "system.h" >> > > > - >> > > > - #include <popt.h> >> > > > -+#include <libgen.h> >> > > > - #include <errno.h> >> > > > - #include <stdio.h> >> > > > - #include <string.h> >> > > > --- >> > > > -2.43.0 >> > > > - >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch >> > > > new file mode 100644 >> > > > index 00000000000..8e73e077049 >> > > > --- /dev/null >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch >> > > > @@ -0,0 +1,56 @@ >> > > > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 >> > > > +From: Panu Matilainen <pmatilai@redhat.com> >> > > > +Date: Mon, 18 Dec 2023 12:25:04 +0200 >> > > > +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag >> > > > + >> > > > +This regressed when we axed our internal glob copy in commit >> > > > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only >> > > > +an optimization so we can just skip it if not available. >> > > > + >> > > > +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > +--- >> > > > + CMakeLists.txt | 1 + >> > > > + config.h.in | 1 + >> > > > + rpmio/rpmglob.c | 2 ++ >> > > > + 3 files changed, 4 insertions(+) >> > > > + >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt >> > > > +index d0ea565f3..0a474106e 100644 >> > > > +--- a/CMakeLists.txt >> > > > ++++ b/CMakeLists.txt >> > > > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) >> > > > + set(HAVE_LIBDW 1) >> > > > + endif() >> > > > + >> > > > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) >> > > > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) >> > > > + if (NOT MAJOR_IN_SYSMACROS) >> > > > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) >> > > > +diff --git a/config.h.in b/config.h.in >> > > > +index cb97827d0..ab1757a9a 100644 >> > > > +--- a/config.h.in >> > > > ++++ b/config.h.in >> > > > +@@ -100,6 +100,7 @@ >> > > > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ >> > > > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ >> > > > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ >> > > > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ >> > > > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ >> > > > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ >> > > > + #cmakedefine RUNDIR @rundir@ >> > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c >> > > > +index 8276eddb4..243568766 100644 >> > > > +--- a/rpmio/rpmglob.c >> > > > ++++ b/rpmio/rpmglob.c >> > > > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, >> > > > + gflags |= GLOB_BRACE; >> > > > + if (home != NULL && strlen(home) > 0) >> > > > + gflags |= GLOB_TILDE; >> > > > ++#if HAVE_GLOB_ONLYDIR >> > > > + if (dir_only) >> > > > + gflags |= GLOB_ONLYDIR; >> > > > ++#endif >> > > > + if (flags & RPMGLOB_NOCHECK) >> > > > + gflags |= GLOB_NOCHECK; >> > > > + >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch >> > > > index bd3314a90f8..fc89b44132b 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 >> > > > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Tue, 17 Jan 2017 14:07:17 +0200 >> > > > Subject: [PATCH] When cross-installing, execute package scriptlets without >> > > > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: >> > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > + >> > > > --- >> > > > lib/rpmscript.c | 11 ++++++++--- >> > > > 1 file changed, 8 insertions(+), 3 deletions(-) >> > > > >> > > > -Index: git/lib/rpmscript.c >> > > > -=================================================================== >> > > > ---- git.orig/lib/rpmscript.c >> > > > -+++ git/lib/rpmscript.c >> > > > -@@ -18,7 +18,7 @@ >> > > > - #include "rpmio/rpmio_internal.h" >> > > > - >> > > > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ >> > > > -- >> > > > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ >> > > > - #include "debug.h" >> > > > - >> > > > - struct scriptNextFileFunc_s { >> > > > -@@ -427,8 +427,7 @@ exit: >> > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c >> > > > +index b18f851a3..36e37cf77 100644 >> > > > +--- a/lib/rpmscript.c >> > > > ++++ b/lib/rpmscript.c >> > > > +@@ -448,8 +448,7 @@ exit: >> > > > Fclose(out); /* XXX dup'd STDOUT_FILENO */ >> > > > >> > > > if (fn) { >> > > > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c >> > > > free(fn); >> > > > } >> > > > free(mline); >> > > > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int >> > > > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, >> > > > >> > > > if (rc != RPMRC_FAIL) { >> > > > if (script_type & RPMSCRIPTLET_EXEC) { >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch >> > > > index 64433abb6a1..5820b2e7e5b 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 >> > > > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex@linutronix.de> >> > > > Date: Tue, 31 Aug 2021 10:37:05 +0200 >> > > > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata >> > > > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). >> > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] >> > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > + >> > > > --- >> > > > build/pack.c | 2 +- >> > > > 1 file changed, 1 insertion(+), 1 deletion(-) >> > > > >> > > > -Index: git/build/pack.c >> > > > -=================================================================== >> > > > ---- git.orig/build/pack.c >> > > > -+++ git/build/pack.c >> > > > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) >> > > > +diff --git a/build/pack.c b/build/pack.c >> > > > +index f382c7da0..0889dd993 100644 >> > > > +--- a/build/pack.c >> > > > ++++ b/build/pack.c >> > > > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) >> > > > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); >> > > > buf = xstrdup(rpmio_flags); >> > > > buf[s - rpmio_flags] = '\0'; >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch >> > > > deleted file mode 100644 >> > > > index 29b6686a940..00000000000 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch >> > > > +++ /dev/null >> > > > @@ -1,28 +0,0 @@ >> > > > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 >> > > > -From: Alexander Kanavin <alex@linutronix.de> >> > > > -Date: Thu, 4 Aug 2022 12:15:08 +0200 >> > > > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling >> > > > - >> > > > -x32 is a 64 bit x86 ABI with 32 bit pointers. >> > > > - >> > > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] >> > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > ---- >> > > > - configure.ac | 4 ++++ >> > > > - 1 file changed, 4 insertions(+) >> > > > - >> > > > -Index: git/configure.ac >> > > > -=================================================================== >> > > > ---- git.orig/configure.ac >> > > > -+++ git/configure.ac >> > > > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > >> > > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` >> > > > - host_os_gnu=-gnux32 >> > > > - fi >> > > > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then >> > > > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` >> > > > -+ host_os_gnu=-gnux32 >> > > > -+fi >> > > > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then >> > > > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` >> > > > - fi >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch >> > > > index 82e6567dc74..8b9f1f72944 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 >> > > > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 >> > > > From: Changqing Li <changqing.li@windriver.com> >> > > > Date: Thu, 7 May 2020 17:40:58 +0800 >> > > > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 >> > > > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". >> > > > Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> >> > > > >> > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> >> > > > + >> > > > --- >> > > > lib/transaction.c | 13 ++++++++++++- >> > > > 1 file changed, 12 insertions(+), 1 deletion(-) >> > > > >> > > > -Index: git/lib/transaction.c >> > > > -=================================================================== >> > > > ---- git.orig/lib/transaction.c >> > > > -+++ git/lib/transaction.c >> > > > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, >> > > > +diff --git a/lib/transaction.c b/lib/transaction.c >> > > > +index 70d2587ac..b89b30060 100644 >> > > > +--- a/lib/transaction.c >> > > > ++++ b/lib/transaction.c >> > > > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, >> > > > rpmfsSetAction(ofs, ofx, FA_CREATE); >> > > > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); >> > > > rConflicts = 0; >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch >> > > > index a6c58699d36..388694d234f 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch >> > > > @@ -1,4 +1,7 @@ >> > > > -perl: disable auto requires >> > > > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 >> > > > +From: Mark Hatle <mark.hatle@windriver.com> >> > > > +Date: Tue, 15 Aug 2017 16:41:57 -0500 >> > > > +Subject: [PATCH] perl: disable auto requires >> > > > >> > > > When generating automatic requirements, it's possible for perl scripts to >> > > > declare 'optional' dependencies. These seem to often be incorrect and will >> > > > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] >> > > > >> > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> >> > > > >> > > > -Index: git/fileattrs/perl.attr >> > > > -=================================================================== >> > > > ---- git.orig/fileattrs/perl.attr >> > > > -+++ git/fileattrs/perl.attr >> > > > +--- >> > > > + fileattrs/perl.attr | 2 +- >> > > > + fileattrs/perllib.attr | 2 +- >> > > > + 2 files changed, 2 insertions(+), 2 deletions(-) >> > > > + >> > > > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr >> > > > +index 0daef58d5..81ddf5305 100644 >> > > > +--- a/fileattrs/perl.attr >> > > > ++++ b/fileattrs/perl.attr >> > > > @@ -1,3 +1,3 @@ >> > > > -%__perl_requires %{_rpmconfigdir}/perl.req >> > > > +#__perl_requires %{_rpmconfigdir}/perl.req >> > > > %__perl_magic ^.*[Pp]erl .*$ >> > > > %__perl_flags exeonly >> > > > -Index: git/fileattrs/perllib.attr >> > > > -=================================================================== >> > > > ---- git.orig/fileattrs/perllib.attr >> > > > -+++ git/fileattrs/perllib.attr >> > > > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr >> > > > +index fcad48099..495a28927 100644 >> > > > +--- a/fileattrs/perllib.attr >> > > > ++++ b/fileattrs/perllib.attr >> > > > @@ -1,5 +1,5 @@ >> > > > %__perllib_provides %{_rpmconfigdir}/perl.prov >> > > > -%__perllib_requires %{_rpmconfigdir}/perl.req >> > > > diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch >> > > > deleted file mode 100644 >> > > > index d0e637191a8..00000000000 >> > > > --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch >> > > > +++ /dev/null >> > > > @@ -1,35 +0,0 @@ >> > > > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 >> > > > -From: Khem Raj <raj.khem@gmail.com> >> > > > -Date: Fri, 3 Mar 2023 09:54:48 -0800 >> > > > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash >> > > > - >> > > > -Fixes >> > > > -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] >> > > > -| hdr_hash, /* tp_hash */ >> > > > -| ^~~~~~~~ >> > > > - >> > > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] >> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> >> > > > ---- >> > > > - python/header-py.c | 4 ++-- >> > > > - 1 file changed, 2 insertions(+), 2 deletions(-) >> > > > - >> > > > -diff --git a/python/header-py.c b/python/header-py.c >> > > > -index 0aed0c9267..c15503f359 100644 >> > > > ---- a/python/header-py.c >> > > > -+++ b/python/header-py.c >> > > > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) >> > > > - "(Oi)", s, RPMTAG_NEVR); >> > > > - } >> > > > - >> > > > --static long hdr_hash(PyObject * h) >> > > > -+static Py_hash_t hdr_hash(PyObject * h) >> > > > - { >> > > > -- return (long) h; >> > > > -+ return (Py_hash_t) h; >> > > > - } >> > > > - >> > > > - static PyObject * hdr_reduce(hdrObject *s) >> > > > --- >> > > > -2.39.2 >> > > > - >> > > > diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >> > > > index 2fe96a839c3..89c23f81975 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >> > > > @@ -1,7 +1,7 @@ >> > > > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 >> > > > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Fri, 20 Jan 2017 13:33:05 +0200 >> > > > -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR >> > > > +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR >> > > > environment variable >> > > > >> > > > This is needed so that rpm can pick up target-specific configuration >> > > > @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. >> > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > + >> > > > --- >> > > > lib/rpmrc.c | 19 ++++++++++++++----- >> > > > 1 file changed, 14 insertions(+), 5 deletions(-) >> > > > >> > > > -Index: git/lib/rpmrc.c >> > > > -=================================================================== >> > > > ---- git.orig/lib/rpmrc.c >> > > > -+++ git/lib/rpmrc.c >> > > > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const >> > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c >> > > > +index f39dcfc11..f27f88753 100644 >> > > > +--- a/lib/rpmrc.c >> > > > ++++ b/lib/rpmrc.c >> > > > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, >> > > > static void setDefaults(void) >> > > > { >> > > > const char *confdir = rpmConfigDir(); >> > > > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c >> > > > + >> > > > if (!defrcfiles) { >> > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", >> > > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", >> > > > -- SYSCONFDIR "/rpmrc", ":"); >> > > > -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); >> > > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", >> > > > +- SYSCONFDIR "/rpmrc", NULL); >> > > > ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); >> > > > } >> > > > >> > > > #ifndef MACROFILES >> > > > @@ -468,9 +472,9 @@ static void setDefaults(void) >> > > > confdir, "/platform/%{_target}/macros", ":", >> > > > confdir, "/fileattrs/*.attr", ":", >> > > > - confdir, "/" RPMCANONVENDOR "/macros", ":", >> > > > + confdir, "/" RPM_VENDOR "/macros", ":", >> > > > - SYSCONFDIR "/rpm/macros.*", ":", >> > > > - SYSCONFDIR "/rpm/macros", ":", >> > > > -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); >> > > > +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); >> > > > + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", >> > > > + etcconfdir, SYSCONFDIR "/rpm/macros", ":", >> > > > -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); >> > > > ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); >> > > > } >> > > > #else >> > > > macrofiles = MACROFILES; >> > > > -@@ -997,7 +1001,11 @@ static void read_auxv(void) >> > > > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) >> > > > */ >> > > > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) >> > > > { >> > > > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c >> > > > static struct utsname un; >> > > > char * chptr; >> > > > canonEntry canon; >> > > > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, >> > > > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) >> > > > >> > > > if (arch) *arch = un.machine; >> > > > if (os) *os = un.sysname; >> > > > diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch >> > > > new file mode 100644 >> > > > index 00000000000..e7f0adc70c9 >> > > > --- /dev/null >> > > > +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch >> > > > @@ -0,0 +1,26 @@ >> > > > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 >> > > > +From: Alexander Kanavin <alex@linutronix.de> >> > > > +Date: Wed, 29 Nov 2023 14:09:06 +0100 >> > > > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html >> > > > + >> > > > +Building html would require doxygen-native. >> > > > + >> > > > +Upstream-Status: Inappropriate [oe-core specific] >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > + >> > > > +--- >> > > > + docs/CMakeLists.txt | 1 - >> > > > + 1 file changed, 1 deletion(-) >> > > > + >> > > > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt >> > > > +index 52dce7b4e..c01ff7757 100644 >> > > > +--- a/docs/CMakeLists.txt >> > > > ++++ b/docs/CMakeLists.txt >> > > > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) >> > > > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) >> > > > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) >> > > > + endif() >> > > > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) >> > > > + >> > > > + install(FILES >> > > > + README.md >> > > > diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch >> > > > new file mode 100644 >> > > > index 00000000000..3d4b09bedb6 >> > > > --- /dev/null >> > > > +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch >> > > > @@ -0,0 +1,34 @@ >> > > > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 >> > > > +From: Alexander Kanavin <alex@linutronix.de> >> > > > +Date: Tue, 16 Jan 2024 09:59:26 +0100 >> > > > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C >> > > > + library >> > > > + >> > > > +This addresses musl failures; if there is code out there relying on >> > > > +those braces, it needs to be fixed when used on musl. >> > > > + >> > > > +This is unlikely to be trivially fixable upstream. >> > > > + >> > > > +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > +--- >> > > > + rpmio/rpmglob.c | 6 ++++++ >> > > > + 1 file changed, 6 insertions(+) >> > > > + >> > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c >> > > > +index 243568766..43c27074a 100644 >> > > > +--- a/rpmio/rpmglob.c >> > > > ++++ b/rpmio/rpmglob.c >> > > > +@@ -33,6 +33,12 @@ >> > > > + >> > > > + #include "debug.h" >> > > > + >> > > > ++/* Don't fail if the standard C library >> > > > +++ * doesn't provide brace expansion */ >> > > > ++#ifndef GLOB_BRACE >> > > > ++#define GLOB_BRACE 0 >> > > > ++#endif >> > > > ++ >> > > > + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ >> > > > + static int ismagic(const char *pattern) >> > > > + { >> > > > diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch >> > > > index 9dbe7125ded..b3d57cc8703 100644 >> > > > --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch >> > > > +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 >> > > > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > Date: Thu, 10 Jan 2019 18:14:18 +0100 >> > > > Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO >> > > > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. >> > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > > > + >> > > > --- >> > > > lib/rpmscript.c | 8 ++++---- >> > > > 1 file changed, 4 insertions(+), 4 deletions(-) >> > > > >> > > > -Index: git/lib/rpmscript.c >> > > > -=================================================================== >> > > > ---- git.orig/lib/rpmscript.c >> > > > -+++ git/lib/rpmscript.c >> > > > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm >> > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c >> > > > +index 37ada014c..bab0c97a6 100644 >> > > > +--- a/lib/rpmscript.c >> > > > ++++ b/lib/rpmscript.c >> > > > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) >> > > > if (Ferror(fd)) >> > > > goto exit; >> > > > >> > > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c >> > > > static const char set_x[] = "set -x\n"; >> > > > /* Assume failures will be caught by the write below */ >> > > > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); >> > > > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu >> > > > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, >> > > > char *mline = NULL; >> > > > rpmRC rc = RPMRC_FAIL; >> > > > >> > > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c >> > > > >> > > > if (script) { >> > > > fn = writeScript(*argvp[0], script); >> > > > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu >> > > > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, >> > > > sname, strerror(errno)); >> > > > goto exit; >> > > > } else if (pid == 0) {/* Child */ >> > > > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c >> > > > sname, *argvp[0], (unsigned)getpid()); >> > > > >> > > > fclose(in); >> > > > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu >> > > > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, >> > > > reaped = waitpid(pid, &status, 0); >> > > > } while (reaped == -1 && errno == EINTR); >> > > > >> > > > diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch >> > > > deleted file mode 100644 >> > > > index 470dda1dcfb..00000000000 >> > > > --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch >> > > > +++ /dev/null >> > > > @@ -1,51 +0,0 @@ >> > > > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 >> > > > -From: Panu Matilainen <pmatilai@redhat.com> >> > > > -Date: Mon, 26 Jun 2023 12:45:09 +0300 >> > > > -Subject: [PATCH] Don't muck with per-process global sqlite configuration from >> > > > - the db backend >> > > > - >> > > > -sqlite3_config() affects all in-process uses of sqlite. librpm being a >> > > > -low-level library, it has no business whatsoever making such decisions >> > > > -for the applications running on top of it. Besides that, the callback can >> > > > -easily end up pointing to an already closed database, causing an >> > > > -innocent API user to crash in librpm on an entirely unrelated error on >> > > > -some other database. "Oops." >> > > > - >> > > > -The sqlite API doesn't seem to provide any per-db or non-global context >> > > > -for logging errors, thus we can only remove the call and let sqlite output >> > > > -errors the way it pleases (print through stderr, presumably). >> > > > - >> > > > -Thanks to Jan Palus for spotting and reporting! >> > > > - >> > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] >> > > > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> >> > > > ---- >> > > > - lib/backend/sqlite.c | 8 -------- >> > > > - 1 file changed, 8 deletions(-) >> > > > - >> > > > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c >> > > > -index 5a029d575a..b612732267 100644 >> > > > ---- a/lib/backend/sqlite.c >> > > > -+++ b/lib/backend/sqlite.c >> > > > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) >> > > > - sqlite3_result_int(sctx, match); >> > > > - } >> > > > - >> > > > --static void errCb(void *data, int err, const char *msg) >> > > > --{ >> > > > -- rpmdb rdb = data; >> > > > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", >> > > > -- rdb->db_descr, sqlite3_errstr(err), msg); >> > > > --} >> > > > -- >> > > > - static int dbiCursorReset(dbiCursor dbc) >> > > > - { >> > > > - if (dbc->stmt) { >> > > > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) >> > > > - * the "database is locked" errors at every cost >> > > > - */ >> > > > - sqlite3_busy_timeout(sdb, 10000); >> > > > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); >> > > > - >> > > > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); >> > > > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); >> > > > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch >> > > > deleted file mode 100644 >> > > > index e5c84ebd498..00000000000 >> > > > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch >> > > > +++ /dev/null >> > > > @@ -1,39 +0,0 @@ >> > > > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 >> > > > -From: Florian Festi <ffesti@redhat.com> >> > > > -Date: Thu, 16 Mar 2023 19:05:04 +0100 >> > > > -Subject: [PATCH] Fix compiler error on clang >> > > > - >> > > > -Turns out variable declarations are not allowed after a label, even in >> > > > -C99. And while some compilers don't seem to care others do. >> > > > - >> > > > -Moving the declaration of mayopen to the start of the function to avoid >> > > > -this problem. >> > > > - >> > > > -Resolves: #2435 >> > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] >> > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> > > > ---- >> > > > - lib/fsm.c | 3 ++- >> > > > - 1 file changed, 2 insertions(+), 1 deletion(-) >> > > > - >> > > > -diff --git a/lib/fsm.c b/lib/fsm.c >> > > > -index 5671ac642d..183293edb0 100644 >> > > > ---- a/lib/fsm.c >> > > > -+++ b/lib/fsm.c >> > > > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, >> > > > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; >> > > > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; >> > > > - int firstlinkfile = -1; >> > > > -+ int mayopen = 0; >> > > > - char *tid = NULL; >> > > > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); >> > > > - struct filedata_s *firstlink = NULL; >> > > > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, >> > > > - >> > > > - setmeta: >> > > > - /* Special files require path-based ops */ >> > > > -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); >> > > > -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); >> > > > - if (!rc && fd == -1 && mayopen) { >> > > > - int flags = O_RDONLY; >> > > > - /* Only follow safe symlinks, and never on temporary files */ >> > > > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb >> > > > similarity index 72% >> > > > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb >> > > > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb >> > > > index 3e85cbb8efe..af11dec5ef3 100644 >> > > > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb >> > > > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb >> > > > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" >> > > > LICENSE = "GPL-2.0-only" >> > > > LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" >> > > > >> > > > -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ >> > > > +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ >> > > > @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc >> > > > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ >> > > > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ >> > > > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ >> > > > - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ >> > > > - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ >> > > > - file://fix-declaration.patch \ >> > > > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ >> > > > - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ >> > > > - file://0001-Fix-missing-basename-include-on-macOS.patch \ >> > > > + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ >> > > > + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ >> > > > + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ >> > > > + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ >> > > > + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ >> > > > " >> > > > >> > > > PE = "1" >> > > > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" >> > > > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" >> > > > >> > > > S = "${WORKDIR}/git" >> > > > >> > > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" >> > > > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" >> > > > DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" >> > > > >> > > > -inherit autotools gettext pkgconfig python3native >> > > > -export PYTHON_ABI >> > > > - >> > > > -AUTOTOOLS_AUXDIR = "${S}/build-aux" >> > > > - >> > > > -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe >> > > > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" >> > > > - >> > > > -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages >> > > > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" >> > > > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" >> > > > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" >> > > > >> > > > # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs >> > > > # --localstatedir prevents rpm from writing its database to native sysroot when building images >> > > > -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset >> > > > -# plugins both behave badly inside builds. >> > > > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" >> > > > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" >> > > > +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" >> > > > +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" >> > > > + >> > > > +inherit cmake gettext pkgconfig python3targetconfig >> > > > +OECMAKE_GENERATOR = "Unix Makefiles" >> > > > >> > > > BBCLASSEXTEND = "native nativesdk" >> > > > >> > > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" >> > > > -# The inhibit plugin serves no purpose outside of the target >> > > > -PACKAGECONFIG:remove:class-native = "inhibit" >> > > > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" >> > > > +PACKAGECONFIG ??= "internal-openpgp" >> > > > >> > > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" >> > > > -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" >> > > > -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" >> > > > -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" >> > > > -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" >> > > > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" >> > > > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" >> > > > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" >> > > > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" >> > > > +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" >> > > > >> > > > -ASNEEDED = "" >> > > > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia >> > > > +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" >> > > > + >> > > > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" >> > > > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" >> > > > +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" >> > > > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" >> > > > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" >> > > > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" >> > > > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" >> > > > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" >> > > > +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" >> > > > +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" >> > > > >> > > > # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in >> > > > # libmagic also has sysroot path contamination, so override it >> > > > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ >> > > > ${libdir}/rpm/rpmdeps \ >> > > > " >> > > > >> > > > -do_configure:prepend() { >> > > > - mkdir -p ${S}/build-aux >> > > > -} >> > > > - >> > > > do_install:append:class-native() { >> > > > for tool in ${WRAPPER_TOOLS}; do >> > > > test -x ${D}$tool && create_wrapper ${D}$tool \ >> > > > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { >> > > > >> > > > do_install:append () { >> > > > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ >> > > > + -e 's:${STAGING_DIR_NATIVE}/::g' \ >> > > > ${D}/${libdir}/rpm/macros >> > > > >> > > > } >> > > > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ >> > > > ${libdir}/rpm/check-* \ >> > > > ${libdir}/rpm/sepdebugcrcfix \ >> > > > ${libdir}/rpm/find-lang.sh \ >> > > > + ${libdir}/rpm/sysusers.sh \ >> > > > ${libdir}/rpm/*provides* \ >> > > > ${libdir}/rpm/*requires* \ >> > > > ${libdir}/rpm/*deps* \ >> > > > -- >> > > > 2.39.2 >> > > > >> > > > >> > > > >> > > > >> > >> > >> > >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#194457): https://lists.openembedded.org/g/openembedded-core/message/194457 >> Mute This Topic: https://lists.openembedded.org/mt/103975822/3618418 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [matt@madison.systems] >> -=-=-=-=-=-=-=-=-=-=-=- >> ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-29 12:22 ` Alexander Kanavin @ 2024-01-29 16:30 ` Matt Madison 0 siblings, 0 replies; 20+ messages in thread From: Matt Madison @ 2024-01-29 16:30 UTC (permalink / raw) To: Alexander Kanavin; +Cc: Khem Raj, openembedded-core [-- Attachment #1: Type: text/plain, Size: 70872 bytes --] I think so. I've submitted a patch for pseudo to add in the missing function. With that in place, and rpm logging turned up to debug and with pseudo logging in place, I can see the calls being caught by pseudo and the correct free space reported. -Matt On Mon, Jan 29, 2024 at 4:22 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > I guess the proper fix should be in pseudo? > > Alex > > On Mon, 29 Jan 2024 at 13:11, Matt Madison <matt@madison.systems> wrote: > > > > I ran across a different failure due to the rpm upgrade, which I've > traced to this change: > > > > > https://github.com/rpm-software-management/rpm/commit/162110aadad445cc248a68dc4c840fe05b79d00f > > > > This is enabling 64-bit filesystem calls in the rpm-native build, > causing it to use statvfs64() instead of statvfs(). Pseudo doesn't handle > statvfs64(), so when rpm checks available disk space, it's looking at the > host system's rootfs instead of the disk where the build is happening. I'm > not sure whether pseudo needs an update, or whether the hard-coded define > added by the above-mentioned commit should be turned off for -native builds. > > > > Regards, > > -Matt > > > > On Mon, Jan 29, 2024 at 3:57 AM Alexander Kanavin < > alex.kanavin@gmail.com> wrote: > >> > >> I sent a patch. > >> > >> Alex > >> > >> On Sun, 28 Jan 2024 at 20:04, Alexander Kanavin via > >> lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> > >> wrote: > >> > > >> > 0257: file = file.replace("%", "%%%%%%%%") > >> > *** 0258: attr = get_attr(file) > >> > ... > >> > *** 0203: stat_f = os.stat(rootpath + "/" + path, > >> > follow_symlinks=False) > >> > > >> > Exception: FileNotFoundError: [Errno 2] No such file or directory: > >> > > '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/nodejs/20.8.1/packages-split/nodejs-ptest/usr/lib/nodejs/ptest/test/fixtures/es-modules/test-esm-double-encoding-native%%%%%%%%20.mjs' > >> > > >> > Seems like 257 and 258 should be swapped. No idea what that % > >> > replacement is for. > >> > > >> > Alex > >> > > >> > On Sun, 28 Jan 2024 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: > >> > > > >> > > I am seeing some failures in meta-oe ( especially nodejs ) which I > >> > > suspect are due to rpm upgrade and patches around it. > >> > > > >> > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio > >> > > > >> > > On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin > >> > > <alex.kanavin@gmail.com> wrote: > >> > > > > >> > > > Upstream has replaced autoconf with cmake, which necessitates a > rewrite of the > >> > > > recipe and available options, and a rebase to cmake of > >> > > > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > >> > > > > >> > > > Correct a mistake in > 0001-Do-not-read-config-files-from-HOME.patch : > >> > > > the patch was removing the NULL marker at the end of function > arguments, > >> > > > and > 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > >> > > > was restoring it (in addition to the actual change the patch was > making). > >> > > > Now both patches preserve the NULL terminator. > >> > > > > >> > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > --- > >> > > > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > >> > > > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > >> > > > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > >> > > > ...satisfiable-dependency-when-building.patch | 12 +-- > >> > > > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > >> > > > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > >> > > > ...-PATH-environment-variable-before-ru.patch | 12 +-- > >> > > > ...lename-before-passing-it-to-basename.patch | 40 ---------- > >> > > > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > >> > > > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > >> > > > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > >> > > > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > >> > > > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > >> > > > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > >> > > > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > >> > > > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > >> > > > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > >> > > > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > >> > > > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > >> > > > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > >> > > > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > >> > > > .../rpm/files/fix-declaration.patch | 39 ---------- > >> > > > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 > ++++++++----------- > >> > > > 23 files changed, 328 insertions(+), 383 deletions(-) > >> > > > create mode 100644 > meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > >> > > > create mode 100644 > meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > >> > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > >> > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > >> > > > create mode 100644 > meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > >> > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > >> > > > delete mode 100644 > meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > >> > > > create mode 100644 > meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > >> > > > create mode 100644 > meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > >> > > > delete mode 100644 > meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > >> > > > delete mode 100644 > meta/recipes-devtools/rpm/files/fix-declaration.patch > >> > > > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} > (72%) > >> > > > > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > >> > > > index 9fa486dfd3c..96fe57dfeb8 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 > 00:00:00 2001 > >> > > > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Thu, 9 Mar 2017 18:54:02 +0200 > >> > > > Subject: [PATCH] Add a color setting for mips64_n32 binaries > >> > > > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > >> > > > 2 files changed, 6 insertions(+) > >> > > > > >> > > > diff --git a/build/rpmfc.c b/build/rpmfc.c > >> > > > -index 26606378f..a16e3f4e9 100644 > >> > > > +index 4b67a9bae..ed7e4e623 100644 > >> > > > --- a/build/rpmfc.c > >> > > > +++ b/build/rpmfc.c > >> > > > -@@ -646,6 +646,7 @@ exit: > >> > > > +@@ -660,6 +660,7 @@ exit: > >> > > > static const struct rpmfcTokens_s rpmfcTokens[] = { > >> > > > { "directory", RPMFC_INCLUDE }, > >> > > > > >> > > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > >> > > > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > >> > > > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > >> > > > > >> > > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > >> > > > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > >> > > > color = RPMFC_ELF32; > >> > > > break; > >> > > > } > >> > > > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > >> > > > if (elf) > >> > > > elf_end(elf); > >> > > > diff --git a/rpmrc.in b/rpmrc.in > >> > > > -index 2975a3a0e..c7232b48b 100644 > >> > > > +index 8646a966b..7349fdfd3 100644 > >> > > > --- a/rpmrc.in > >> > > > +++ b/rpmrc.in > >> > > > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > >> > > > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > >> > > > archcolor: mips64r6 2 > >> > > > archcolor: mips64r6el 2 > >> > > > > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > >> > > > new file mode 100644 > >> > > > index 00000000000..5053caae33f > >> > > > --- /dev/null > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > >> > > > @@ -0,0 +1,28 @@ > >> > > > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 > 00:00:00 2001 > >> > > > +From: Alexander Kanavin <alex@linutronix.de> > >> > > > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > >> > > > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config > rather than > >> > > > + cmake modules > >> > > > + > >> > > > +Otherwise cmake will try to find libm, badly, and fail. > >> > > > + > >> > > > +Upstream-Status: Inappropriate [oe-core specific] > >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > + > >> > > > +--- > >> > > > + CMakeLists.txt | 2 +- > >> > > > + 1 file changed, 1 insertion(+), 1 deletion(-) > >> > > > + > >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > >> > > > +index 7f0630453..d0ea565f3 100644 > >> > > > +--- a/CMakeLists.txt > >> > > > ++++ b/CMakeLists.txt > >> > > > +@@ -187,7 +187,7 @@ set(REQFUNCS > >> > > > + ) > >> > > > + > >> > > > + find_package(PkgConfig REQUIRED) > >> > > > +-find_package(Lua 5.2 REQUIRED) > >> > > > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > >> > > > + find_package(ZLIB REQUIRED) > >> > > > + find_package(BZip2) > >> > > > + find_package(Iconv) > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > >> > > > new file mode 100644 > >> > > > index 00000000000..db83b176b41 > >> > > > --- /dev/null > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > >> > > > @@ -0,0 +1,42 @@ > >> > > > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 > 00:00:00 2001 > >> > > > +From: Alexander Kanavin <alex@linutronix.de> > >> > > > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > >> > > > +Subject: [PATCH] CMakeLists.txt: restore readline support as an > explicit > >> > > > + option > >> > > > + > >> > > > +This was lost in autotools -> cmake transition. The particular > >> > > > +reason to make it explicit is that readline is gpl version 3 > >> > > > +licensed, and in some builds components under that license > >> > > > +need to be excluded. > >> > > > + > >> > > > +Upstream-Status: Submitted [ > https://github.com/rpm-software-management/rpm/pull/2852] > >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > +--- > >> > > > + CMakeLists.txt | 7 ++++++- > >> > > > + 1 file changed, 6 insertions(+), 1 deletion(-) > >> > > > + > >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > >> > > > +index 0a474106e..89e27417f 100644 > >> > > > +--- a/CMakeLists.txt > >> > > > ++++ b/CMakeLists.txt > >> > > > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" > ON) > >> > > > + option(WITH_FSVERITY "Build with fsverity support" OFF) > >> > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > >> > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > >> > > > ++option(WITH_READLINE "Build with readline support" ON) > >> > > > + > >> > > > + set(RPM_CONFIGDIR > "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > >> > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > >> > > > +@@ -193,7 +194,11 @@ find_package(BZip2) > >> > > > + find_package(Iconv) > >> > > > + > >> > > > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > >> > > > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > >> > > > ++ > >> > > > ++if (WITH_READLINE) > >> > > > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET > readline) > >> > > > ++endif() > >> > > > ++ > >> > > > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > >> > > > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > >> > > > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > >> > > > index 8440c3516d6..df5543873c1 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 > 00:00:00 2001 > >> > > > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Mon, 9 Jan 2017 18:52:11 +0200 > >> > > > Subject: [PATCH] Do not add an unsatisfiable dependency when > building rpms in > >> > > > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > >> > > > build/pack.c | 4 ---- > >> > > > 1 file changed, 4 deletions(-) > >> > > > > >> > > > -Index: git/build/pack.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/build/pack.c > >> > > > -+++ git/build/pack.c > >> > > > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > >> > > > +diff --git a/build/pack.c b/build/pack.c > >> > > > +index f7dac6d9a..f382c7da0 100644 > >> > > > +--- a/build/pack.c > >> > > > ++++ b/build/pack.c > >> > > > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, > Package pkg, const char *cookie, int ch > >> > > > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, > spec->sourcePkgId,16); > >> > > > } > >> > > > > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > >> > > > index 8fdc5edb10b..b056d19741a 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 > 00:00:00 2001 > >> > > > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Mon, 27 Feb 2017 09:43:30 +0200 > >> > > > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation > path for > >> > > > @@ -8,29 +8,28 @@ Upstream-Status: Denied [ > https://github.com/rpm-software-management/rpm/pull/263 > >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > > >> > > > --- > >> > > > - configure.ac | 2 +- > >> > > > - macros.in | 2 +- > >> > > > - rpm.am | 4 ++-- > >> > > > - 3 files changed, 4 insertions(+), 4 deletions(-) > >> > > > + CMakeLists.txt | 2 +- > >> > > > + macros.in | 2 +- > >> > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > >> > > > > >> > > > -diff --git a/configure.ac b/configure.ac > >> > > > -index e6676c581..ec28db9b6 100644 > >> > > > ---- a/configure.ac > >> > > > -+++ b/configure.ac > >> > > > -@@ -942,7 +942,7 @@ else > >> > > > - usrprefix=$prefix > >> > > > - fi > >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > >> > > > +index 2767915fb..7f0630453 100644 > >> > > > +--- a/CMakeLists.txt > >> > > > ++++ b/CMakeLists.txt > >> > > > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity > support" OFF) > >> > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > >> > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > >> > > > > >> > > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > >> > > > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > >> > > > - AC_SUBST(RPMCONFIGDIR) > >> > > > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH > "rpm home") > >> > > > ++set(RPM_CONFIGDIR > "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > >> > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > >> > > > > >> > > > - AC_SUBST(OBJDUMP) > >> > > > + # Emulate libtool versioning. Before a public release: > >> > > > diff --git a/macros.in b/macros.in > >> > > > -index a2411d784..735b74d99 100644 > >> > > > +index b49ffaad4..3acbe78f6 100644 > >> > > > --- a/macros.in > >> > > > +++ b/macros.in > >> > > > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > >> > > > +@@ -969,7 +969,7 @@ Supplements: (%{name} = > %{version}-%{release} and langpacks-%{1})\ > >> > > > %_sharedstatedir %{_prefix}/com > >> > > > %_localstatedir %{_prefix}/var > >> > > > %_lib lib > >> > > > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > >> > > > %_includedir %{_prefix}/include > >> > > > %_infodir %{_datadir}/info > >> > > > %_mandir %{_datadir}/man > >> > > > -diff --git a/rpm.am b/rpm.am > >> > > > -index 55b5b3935..5a51f102b 100644 > >> > > > ---- a/rpm.am > >> > > > -+++ b/rpm.am > >> > > > -@@ -1,10 +1,10 @@ > >> > > > - # Internal binaries > >> > > > - ## HACK: It probably should be $(libexecdir)/rpm or > $(libdir)/rpm > >> > > > --rpmlibexecdir = $(prefix)/lib/rpm > >> > > > -+rpmlibexecdir = $(libdir)/rpm > >> > > > - > >> > > > - # Host independent config files > >> > > > - ## HACK: it probably should be $(datadir)/rpm > >> > > > --rpmconfigdir = $(prefix)/lib/rpm > >> > > > -+rpmconfigdir = $(libdir)/rpm > >> > > > - > >> > > > - # Libtool version (current-revision-age) for all our libraries > >> > > > - rpm_version_info = 13:0:4 > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > >> > > > index fda64eefe01..6a18679da2f 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > >> > > > @@ -1,35 +1,36 @@ > >> > > > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 > 00:00:00 2001 > >> > > > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Tue, 10 Jan 2017 14:11:30 +0200 > >> > > > Subject: [PATCH] Do not read config files from $HOME > >> > > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] > >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > + > >> > > > --- > >> > > > lib/rpmrc.c | 6 ++---- > >> > > > 1 file changed, 2 insertions(+), 4 deletions(-) > >> > > > > >> > > > -Index: git/lib/rpmrc.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/lib/rpmrc.c > >> > > > -+++ git/lib/rpmrc.c > >> > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > >> > > > +index 269d490ac..f39dcfc11 100644 > >> > > > +--- a/lib/rpmrc.c > >> > > > ++++ b/lib/rpmrc.c > >> > > > @@ -458,8 +458,7 @@ static void setDefaults(void) > >> > > > if (!defrcfiles) { > >> > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > >> > > > - confdir, "/" RPMCANONVENDOR > "/rpmrc", ":", > >> > > > + confdir, "/" RPM_VENDOR "/rpmrc", > ":", > >> > > > - SYSCONFDIR "/rpmrc", ":", > >> > > > - "~/.rpmrc", NULL); > >> > > > -+ SYSCONFDIR "/rpmrc", ":"); > >> > > > ++ SYSCONFDIR "/rpmrc", NULL); > >> > > > } > >> > > > > >> > > > #ifndef MACROFILES > >> > > > @@ -471,8 +470,7 @@ static void setDefaults(void) > >> > > > - confdir, "/" RPMCANONVENDOR > "/macros", ":", > >> > > > + confdir, "/" RPM_VENDOR > "/macros", ":", > >> > > > SYSCONFDIR "/rpm/macros.*", ":", > >> > > > SYSCONFDIR "/rpm/macros", ":", > >> > > > - SYSCONFDIR > "/rpm/%{_target}/macros", ":", > >> > > > - "~/.rpmmacros", NULL); > >> > > > -+ SYSCONFDIR > "/rpm/%{_target}/macros", ":"); > >> > > > ++ SYSCONFDIR > "/rpm/%{_target}/macros", NULL); > >> > > > } > >> > > > #else > >> > > > macrofiles = MACROFILES; > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > >> > > > index ae24b663aae..318f65ed375 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 > 00:00:00 2001 > >> > > > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Fri, 20 Jan 2017 13:32:06 +0200 > >> > > > Subject: [PATCH] Do not reset the PATH environment variable > before running > >> > > > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > >> > > > lib/rpmscript.c | 2 +- > >> > > > 1 file changed, 1 insertion(+), 1 deletion(-) > >> > > > > >> > > > -Index: git/lib/rpmscript.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/lib/rpmscript.c > >> > > > -+++ git/lib/rpmscript.c > >> > > > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > >> > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > >> > > > +index 36e37cf77..37ada014c 100644 > >> > > > +--- a/lib/rpmscript.c > >> > > > ++++ b/lib/rpmscript.c > >> > > > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, > ARGV_const_t prefixes, > >> > > > if (ipath && ipath[5] != '%') > >> > > > path = ipath; > >> > > > > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > >> > > > deleted file mode 100644 > >> > > > index f9b809d1676..00000000000 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > >> > > > +++ /dev/null > >> > > > @@ -1,40 +0,0 @@ > >> > > > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 > 00:00:00 2001 > >> > > > -From: Florian Festi <ffesti@redhat.com> > >> > > > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > >> > > > -Subject: [PATCH] Duplicate filename before passing it to basename > >> > > > - > >> > > > -basename is allowed change the string passed to it. While we > don't need > >> > > > -the filename after that just casting away the const seems a bit > too > >> > > > -hacky. > >> > > > - > >> > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 > ] > >> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > >> > > > ---- > >> > > > - tools/rpmuncompress.c | 4 +++- > >> > > > - 1 file changed, 3 insertions(+), 1 deletion(-) > >> > > > - > >> > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > >> > > > -index 58ddf5683..e13cc6a66 100644 > >> > > > ---- a/tools/rpmuncompress.c > >> > > > -+++ b/tools/rpmuncompress.c > >> > > > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > >> > > > - if (needtar) { > >> > > > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, > taropts); > >> > > > - } else if (at->compressed == COMPRESSED_GEM) { > >> > > > -- const char *bn = basename(fn); > >> > > > -+ char *tmp = xstrdup(fn); > >> > > > -+ const char *bn = basename(tmp); > >> > > > - size_t nvlen = strlen(bn) - 3; > >> > > > - char *gem = rpmGetPath("%{__gem}", NULL); > >> > > > - char *gemspec = NULL; > >> > > > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > >> > > > - > >> > > > - free(gemspec); > >> > > > - free(gem); > >> > > > -+ free(tmp); > >> > > > - } else { > >> > > > - rasprintf(&buf, "%s '%s'", zipper, fn); > >> > > > - } > >> > > > --- > >> > > > -2.43.0 > >> > > > - > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > >> > > > deleted file mode 100644 > >> > > > index a93597a8352..00000000000 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > >> > > > +++ /dev/null > >> > > > @@ -1,26 +0,0 @@ > >> > > > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 > 00:00:00 2001 > >> > > > -From: Calvin Buckley <calvin@cmpct.info> > >> > > > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > >> > > > -Subject: [PATCH] Fix missing basename include on macOS > >> > > > - > >> > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d > ] > >> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > >> > > > ---- > >> > > > - tools/rpmuncompress.c | 1 + > >> > > > - 1 file changed, 1 insertion(+) > >> > > > - > >> > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > >> > > > -index bd4146d54..58ddf5683 100644 > >> > > > ---- a/tools/rpmuncompress.c > >> > > > -+++ b/tools/rpmuncompress.c > >> > > > -@@ -1,6 +1,7 @@ > >> > > > - #include "system.h" > >> > > > - > >> > > > - #include <popt.h> > >> > > > -+#include <libgen.h> > >> > > > - #include <errno.h> > >> > > > - #include <stdio.h> > >> > > > - #include <string.h> > >> > > > --- > >> > > > -2.43.0 > >> > > > - > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > >> > > > new file mode 100644 > >> > > > index 00000000000..8e73e077049 > >> > > > --- /dev/null > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > >> > > > @@ -0,0 +1,56 @@ > >> > > > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 > 00:00:00 2001 > >> > > > +From: Panu Matilainen <pmatilai@redhat.com> > >> > > > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > >> > > > +Subject: [PATCH] Fix unconditional dependency on non-POSIX > GLOB_ONLYDIR flag > >> > > > + > >> > > > +This regressed when we axed our internal glob copy in commit > >> > > > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR > is only > >> > > > +an optimization so we can just skip it if not available. > >> > > > + > >> > > > +Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1 > ] > >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > +--- > >> > > > + CMakeLists.txt | 1 + > >> > > > + config.h.in | 1 + > >> > > > + rpmio/rpmglob.c | 2 ++ > >> > > > + 3 files changed, 4 insertions(+) > >> > > > + > >> > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > >> > > > +index d0ea565f3..0a474106e 100644 > >> > > > +--- a/CMakeLists.txt > >> > > > ++++ b/CMakeLists.txt > >> > > > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > >> > > > + set(HAVE_LIBDW 1) > >> > > > + endif() > >> > > > + > >> > > > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > >> > > > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > >> > > > + if (NOT MAJOR_IN_SYSMACROS) > >> > > > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > >> > > > +diff --git a/config.h.in b/config.h.in > >> > > > +index cb97827d0..ab1757a9a 100644 > >> > > > +--- a/config.h.in > >> > > > ++++ b/config.h.in > >> > > > +@@ -100,6 +100,7 @@ > >> > > > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > >> > > > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > >> > > > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > >> > > > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > >> > > > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > >> > > > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > >> > > > + #cmakedefine RUNDIR @rundir@ > >> > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > >> > > > +index 8276eddb4..243568766 100644 > >> > > > +--- a/rpmio/rpmglob.c > >> > > > ++++ b/rpmio/rpmglob.c > >> > > > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, > rpmglobFlags flags, > >> > > > + gflags |= GLOB_BRACE; > >> > > > + if (home != NULL && strlen(home) > 0) > >> > > > + gflags |= GLOB_TILDE; > >> > > > ++#if HAVE_GLOB_ONLYDIR > >> > > > + if (dir_only) > >> > > > + gflags |= GLOB_ONLYDIR; > >> > > > ++#endif > >> > > > + if (flags & RPMGLOB_NOCHECK) > >> > > > + gflags |= GLOB_NOCHECK; > >> > > > + > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > >> > > > index bd3314a90f8..fc89b44132b 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 > 00:00:00 2001 > >> > > > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Tue, 17 Jan 2017 14:07:17 +0200 > >> > > > Subject: [PATCH] When cross-installing, execute package > scriptlets without > >> > > > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson < > olofjn@axis.com>: > >> > > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] > >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > + > >> > > > --- > >> > > > lib/rpmscript.c | 11 ++++++++--- > >> > > > 1 file changed, 8 insertions(+), 3 deletions(-) > >> > > > > >> > > > -Index: git/lib/rpmscript.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/lib/rpmscript.c > >> > > > -+++ git/lib/rpmscript.c > >> > > > -@@ -18,7 +18,7 @@ > >> > > > - #include "rpmio/rpmio_internal.h" > >> > > > - > >> > > > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > >> > > > -- > >> > > > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > >> > > > - #include "debug.h" > >> > > > - > >> > > > - struct scriptNextFileFunc_s { > >> > > > -@@ -427,8 +427,7 @@ exit: > >> > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > >> > > > +index b18f851a3..36e37cf77 100644 > >> > > > +--- a/lib/rpmscript.c > >> > > > ++++ b/lib/rpmscript.c > >> > > > +@@ -448,8 +448,7 @@ exit: > >> > > > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > >> > > > > >> > > > if (fn) { > >> > > > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > >> > > > free(fn); > >> > > > } > >> > > > free(mline); > >> > > > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > >> > > > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int > arg1, int arg2, FD_t scriptFd, > >> > > > > >> > > > if (rc != RPMRC_FAIL) { > >> > > > if (script_type & RPMSCRIPTLET_EXEC) { > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > >> > > > index 64433abb6a1..5820b2e7e5b 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 > 00:00:00 2001 > >> > > > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex@linutronix.de> > >> > > > Date: Tue, 31 Aug 2021 10:37:05 +0200 > >> > > > Subject: [PATCH] build/pack.c: do not insert payloadflags into > .rpm metadata > >> > > > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for > .rpm). > >> > > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] > >> > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > + > >> > > > --- > >> > > > build/pack.c | 2 +- > >> > > > 1 file changed, 1 insertion(+), 1 deletion(-) > >> > > > > >> > > > -Index: git/build/pack.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/build/pack.c > >> > > > -+++ git/build/pack.c > >> > > > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > >> > > > +diff --git a/build/pack.c b/build/pack.c > >> > > > +index f382c7da0..0889dd993 100644 > >> > > > +--- a/build/pack.c > >> > > > ++++ b/build/pack.c > >> > > > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > >> > > > headerPutString(pkg->header, > RPMTAG_PAYLOADCOMPRESSOR, compr); > >> > > > buf = xstrdup(rpmio_flags); > >> > > > buf[s - rpmio_flags] = '\0'; > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > >> > > > deleted file mode 100644 > >> > > > index 29b6686a940..00000000000 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > >> > > > +++ /dev/null > >> > > > @@ -1,28 +0,0 @@ > >> > > > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 > 00:00:00 2001 > >> > > > -From: Alexander Kanavin <alex@linutronix.de> > >> > > > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > >> > > > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to > triplet handling > >> > > > - > >> > > > -x32 is a 64 bit x86 ABI with 32 bit pointers. > >> > > > - > >> > > > -Upstream-Status: Submitted [ > https://github.com/rpm-software-management/rpm/pull/2143] > >> > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > ---- > >> > > > - configure.ac | 4 ++++ > >> > > > - 1 file changed, 4 insertions(+) > >> > > > - > >> > > > -Index: git/configure.ac > >> > > > > -=================================================================== > >> > > > ---- git.orig/configure.ac > >> > > > -+++ git/configure.ac > >> > > > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > >> > > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > >> > > > - host_os_gnu=-gnux32 > >> > > > - fi > >> > > > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > >> > > > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > >> > > > -+ host_os_gnu=-gnux32 > >> > > > -+fi > >> > > > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > >> > > > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > >> > > > - fi > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > >> > > > index 82e6567dc74..8b9f1f72944 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 > 00:00:00 2001 > >> > > > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Changqing Li <changqing.li@windriver.com> > >> > > > Date: Thu, 7 May 2020 17:40:58 +0800 > >> > > > Subject: [PATCH] lib/transaction.c: fix file conflicts for > MIPS64 N32 > >> > > > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' > resolution when "neither is preferred". > >> > > > Upstream-Status: Submitted < > https://github.com/rpm-software-management/rpm/issues/193> > >> > > > > >> > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > >> > > > + > >> > > > --- > >> > > > lib/transaction.c | 13 ++++++++++++- > >> > > > 1 file changed, 12 insertions(+), 1 deletion(-) > >> > > > > >> > > > -Index: git/lib/transaction.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/lib/transaction.c > >> > > > -+++ git/lib/transaction.c > >> > > > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > >> > > > +diff --git a/lib/transaction.c b/lib/transaction.c > >> > > > +index 70d2587ac..b89b30060 100644 > >> > > > +--- a/lib/transaction.c > >> > > > ++++ b/lib/transaction.c > >> > > > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > >> > > > rpmfsSetAction(ofs, ofx, FA_CREATE); > >> > > > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > >> > > > rConflicts = 0; > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > >> > > > index a6c58699d36..388694d234f 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > >> > > > @@ -1,4 +1,7 @@ > >> > > > -perl: disable auto requires > >> > > > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 > 00:00:00 2001 > >> > > > +From: Mark Hatle <mark.hatle@windriver.com> > >> > > > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > >> > > > +Subject: [PATCH] perl: disable auto requires > >> > > > > >> > > > When generating automatic requirements, it's possible for perl > scripts to > >> > > > declare 'optional' dependencies. These seem to often be > incorrect and will > >> > > > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific > configuration] > >> > > > > >> > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > >> > > > > >> > > > -Index: git/fileattrs/perl.attr > >> > > > > -=================================================================== > >> > > > ---- git.orig/fileattrs/perl.attr > >> > > > -+++ git/fileattrs/perl.attr > >> > > > +--- > >> > > > + fileattrs/perl.attr | 2 +- > >> > > > + fileattrs/perllib.attr | 2 +- > >> > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > >> > > > + > >> > > > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > >> > > > +index 0daef58d5..81ddf5305 100644 > >> > > > +--- a/fileattrs/perl.attr > >> > > > ++++ b/fileattrs/perl.attr > >> > > > @@ -1,3 +1,3 @@ > >> > > > -%__perl_requires %{_rpmconfigdir}/perl.req > >> > > > +#__perl_requires %{_rpmconfigdir}/perl.req > >> > > > %__perl_magic ^.*[Pp]erl .*$ > >> > > > %__perl_flags exeonly > >> > > > -Index: git/fileattrs/perllib.attr > >> > > > > -=================================================================== > >> > > > ---- git.orig/fileattrs/perllib.attr > >> > > > -+++ git/fileattrs/perllib.attr > >> > > > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > >> > > > +index fcad48099..495a28927 100644 > >> > > > +--- a/fileattrs/perllib.attr > >> > > > ++++ b/fileattrs/perllib.attr > >> > > > @@ -1,5 +1,5 @@ > >> > > > %__perllib_provides %{_rpmconfigdir}/perl.prov > >> > > > -%__perllib_requires %{_rpmconfigdir}/perl.req > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > >> > > > deleted file mode 100644 > >> > > > index d0e637191a8..00000000000 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > >> > > > +++ /dev/null > >> > > > @@ -1,35 +0,0 @@ > >> > > > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 > 00:00:00 2001 > >> > > > -From: Khem Raj <raj.khem@gmail.com> > >> > > > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > >> > > > -Subject: [PATCH] python: Use Py_hash_t instead of long in > hdr_hash > >> > > > - > >> > > > -Fixes > >> > > > -python/header-py.c:744:2: error: incompatible function pointer > types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an > expression of type 'long (PyObject *)' (aka 'long (struct _object *)') > [-Wincompatible-function-pointer-types] > >> > > > -| hdr_hash, /* tp_hash */ > >> > > > -| ^~~~~~~~ > >> > > > - > >> > > > -Upstream-Status: Submitted [ > https://github.com/rpm-software-management/rpm/pull/2409] > >> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > >> > > > ---- > >> > > > - python/header-py.c | 4 ++-- > >> > > > - 1 file changed, 2 insertions(+), 2 deletions(-) > >> > > > - > >> > > > -diff --git a/python/header-py.c b/python/header-py.c > >> > > > -index 0aed0c9267..c15503f359 100644 > >> > > > ---- a/python/header-py.c > >> > > > -+++ b/python/header-py.c > >> > > > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * > s) > >> > > > - "(Oi)", s, RPMTAG_NEVR); > >> > > > - } > >> > > > - > >> > > > --static long hdr_hash(PyObject * h) > >> > > > -+static Py_hash_t hdr_hash(PyObject * h) > >> > > > - { > >> > > > -- return (long) h; > >> > > > -+ return (Py_hash_t) h; > >> > > > - } > >> > > > - > >> > > > - static PyObject * hdr_reduce(hdrObject *s) > >> > > > --- > >> > > > -2.39.2 > >> > > > - > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > >> > > > index 2fe96a839c3..89c23f81975 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > >> > > > @@ -1,7 +1,7 @@ > >> > > > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 > 00:00:00 2001 > >> > > > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Fri, 20 Jan 2017 13:33:05 +0200 > >> > > > -Subject: [PATCH 2/2] Add support for prefixing /etc from > RPM_ETCCONFIGDIR > >> > > > +Subject: [PATCH] Add support for prefixing /etc from > RPM_ETCCONFIGDIR > >> > > > environment variable > >> > > > > >> > > > This is needed so that rpm can pick up target-specific > configuration > >> > > > @@ -9,15 +9,16 @@ from target rootfs instead of its own native > sysroot. > >> > > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] > >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > + > >> > > > --- > >> > > > lib/rpmrc.c | 19 ++++++++++++++----- > >> > > > 1 file changed, 14 insertions(+), 5 deletions(-) > >> > > > > >> > > > -Index: git/lib/rpmrc.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/lib/rpmrc.c > >> > > > -+++ git/lib/rpmrc.c > >> > > > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > >> > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > >> > > > +index f39dcfc11..f27f88753 100644 > >> > > > +--- a/lib/rpmrc.c > >> > > > ++++ b/lib/rpmrc.c > >> > > > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > char * name, > >> > > > static void setDefaults(void) > >> > > > { > >> > > > const char *confdir = rpmConfigDir(); > >> > > > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > >> > > > + > >> > > > if (!defrcfiles) { > >> > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > >> > > > - confdir, "/" RPMCANONVENDOR > "/rpmrc", ":", > >> > > > -- SYSCONFDIR "/rpmrc", ":"); > >> > > > -+ etcconfdir, SYSCONFDIR "/rpmrc", > ":", NULL); > >> > > > + confdir, "/" RPM_VENDOR "/rpmrc", > ":", > >> > > > +- SYSCONFDIR "/rpmrc", NULL); > >> > > > ++ etcconfdir, SYSCONFDIR "/rpmrc", > NULL); > >> > > > } > >> > > > > >> > > > #ifndef MACROFILES > >> > > > @@ -468,9 +472,9 @@ static void setDefaults(void) > >> > > > confdir, > "/platform/%{_target}/macros", ":", > >> > > > confdir, "/fileattrs/*.attr", ":", > >> > > > - confdir, "/" RPMCANONVENDOR > "/macros", ":", > >> > > > + confdir, "/" RPM_VENDOR > "/macros", ":", > >> > > > - SYSCONFDIR "/rpm/macros.*", ":", > >> > > > - SYSCONFDIR "/rpm/macros", ":", > >> > > > -- SYSCONFDIR > "/rpm/%{_target}/macros", ":"); > >> > > > +- SYSCONFDIR > "/rpm/%{_target}/macros", NULL); > >> > > > + etcconfdir, SYSCONFDIR > "/rpm/macros.*", ":", > >> > > > + etcconfdir, SYSCONFDIR > "/rpm/macros", ":", > >> > > > -+ etcconfdir, SYSCONFDIR > "/rpm/%{_target}/macros", ":", NULL); > >> > > > ++ etcconfdir, SYSCONFDIR > "/rpm/%{_target}/macros", NULL); > >> > > > } > >> > > > #else > >> > > > macrofiles = MACROFILES; > >> > > > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > >> > > > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > >> > > > */ > >> > > > static void defaultMachine(rpmrcCtx ctx, const char ** arch, > const char ** os) > >> > > > { > >> > > > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > >> > > > static struct utsname un; > >> > > > char * chptr; > >> > > > canonEntry canon; > >> > > > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > >> > > > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, > const char ** arch, const char ** os) > >> > > > > >> > > > if (arch) *arch = un.machine; > >> > > > if (os) *os = un.sysname; > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > >> > > > new file mode 100644 > >> > > > index 00000000000..e7f0adc70c9 > >> > > > --- /dev/null > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > >> > > > @@ -0,0 +1,26 @@ > >> > > > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 > 00:00:00 2001 > >> > > > +From: Alexander Kanavin <alex@linutronix.de> > >> > > > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > >> > > > +Subject: [PATCH] docs/CMakeLists.txt: do not install > non-existent docs/html > >> > > > + > >> > > > +Building html would require doxygen-native. > >> > > > + > >> > > > +Upstream-Status: Inappropriate [oe-core specific] > >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > + > >> > > > +--- > >> > > > + docs/CMakeLists.txt | 1 - > >> > > > + 1 file changed, 1 deletion(-) > >> > > > + > >> > > > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > >> > > > +index 52dce7b4e..c01ff7757 100644 > >> > > > +--- a/docs/CMakeLists.txt > >> > > > ++++ b/docs/CMakeLists.txt > >> > > > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > >> > > > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > >> > > > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > >> > > > + endif() > >> > > > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION > ${CMAKE_INSTALL_DOCDIR}/API) > >> > > > + > >> > > > + install(FILES > >> > > > + README.md > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > >> > > > new file mode 100644 > >> > > > index 00000000000..3d4b09bedb6 > >> > > > --- /dev/null > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > >> > > > @@ -0,0 +1,34 @@ > >> > > > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 > 00:00:00 2001 > >> > > > +From: Alexander Kanavin <alex@linutronix.de> > >> > > > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > >> > > > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if > undefined by C > >> > > > + library > >> > > > + > >> > > > +This addresses musl failures; if there is code out there relying > on > >> > > > +those braces, it needs to be fixed when used on musl. > >> > > > + > >> > > > +This is unlikely to be trivially fixable upstream. > >> > > > + > >> > > > +Upstream-Status: Inappropriate [reported at > https://github.com/rpm-software-management/rpm/issues/2844] > >> > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > +--- > >> > > > + rpmio/rpmglob.c | 6 ++++++ > >> > > > + 1 file changed, 6 insertions(+) > >> > > > + > >> > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > >> > > > +index 243568766..43c27074a 100644 > >> > > > +--- a/rpmio/rpmglob.c > >> > > > ++++ b/rpmio/rpmglob.c > >> > > > +@@ -33,6 +33,12 @@ > >> > > > + > >> > > > + #include "debug.h" > >> > > > + > >> > > > ++/* Don't fail if the standard C library > >> > > > +++ * doesn't provide brace expansion */ > >> > > > ++#ifndef GLOB_BRACE > >> > > > ++#define GLOB_BRACE 0 > >> > > > ++#endif > >> > > > ++ > >> > > > + /* Return 1 if pattern contains a magic char, see glob(7) for a > list */ > >> > > > + static int ismagic(const char *pattern) > >> > > > + { > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > >> > > > index 9dbe7125ded..b3d57cc8703 100644 > >> > > > --- > a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > >> > > > +++ > b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 > 00:00:00 2001 > >> > > > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 > 00:00:00 2001 > >> > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > Date: Thu, 10 Jan 2019 18:14:18 +0100 > >> > > > Subject: [PATCH] rpmscript.c: change logging level around > scriptlets to INFO > >> > > > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > >> > > > > >> > > > Upstream-Status: Inappropriate [oe-core specific] > >> > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > > + > >> > > > --- > >> > > > lib/rpmscript.c | 8 ++++---- > >> > > > 1 file changed, 4 insertions(+), 4 deletions(-) > >> > > > > >> > > > -Index: git/lib/rpmscript.c > >> > > > > -=================================================================== > >> > > > ---- git.orig/lib/rpmscript.c > >> > > > -+++ git/lib/rpmscript.c > >> > > > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > >> > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > >> > > > +index 37ada014c..bab0c97a6 100644 > >> > > > +--- a/lib/rpmscript.c > >> > > > ++++ b/lib/rpmscript.c > >> > > > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, > const char *script) > >> > > > if (Ferror(fd)) > >> > > > goto exit; > >> > > > > >> > > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > >> > > > static const char set_x[] = "set -x\n"; > >> > > > /* Assume failures will be caught by the write below */ > >> > > > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > >> > > > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > >> > > > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins > plugins, ARGV_const_t prefixes, > >> > > > char *mline = NULL; > >> > > > rpmRC rc = RPMRC_FAIL; > >> > > > > >> > > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > >> > > > > >> > > > if (script) { > >> > > > fn = writeScript(*argvp[0], script); > >> > > > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > >> > > > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins > plugins, ARGV_const_t prefixes, > >> > > > sname, strerror(errno)); > >> > > > goto exit; > >> > > > } else if (pid == 0) {/* Child */ > >> > > > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > >> > > > sname, *argvp[0], (unsigned)getpid()); > >> > > > > >> > > > fclose(in); > >> > > > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > >> > > > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins > plugins, ARGV_const_t prefixes, > >> > > > reaped = waitpid(pid, &status, 0); > >> > > > } while (reaped == -1 && errno == EINTR); > >> > > > > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > >> > > > deleted file mode 100644 > >> > > > index 470dda1dcfb..00000000000 > >> > > > --- > a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > >> > > > +++ /dev/null > >> > > > @@ -1,51 +0,0 @@ > >> > > > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 > 00:00:00 2001 > >> > > > -From: Panu Matilainen <pmatilai@redhat.com> > >> > > > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > >> > > > -Subject: [PATCH] Don't muck with per-process global sqlite > configuration from > >> > > > - the db backend > >> > > > - > >> > > > -sqlite3_config() affects all in-process uses of sqlite. librpm > being a > >> > > > -low-level library, it has no business whatsoever making such > decisions > >> > > > -for the applications running on top of it. Besides that, the > callback can > >> > > > -easily end up pointing to an already closed database, causing an > >> > > > -innocent API user to crash in librpm on an entirely unrelated > error on > >> > > > -some other database. "Oops." > >> > > > - > >> > > > -The sqlite API doesn't seem to provide any per-db or non-global > context > >> > > > -for logging errors, thus we can only remove the call and let > sqlite output > >> > > > -errors the way it pleases (print through stderr, presumably). > >> > > > - > >> > > > -Thanks to Jan Palus for spotting and reporting! > >> > > > - > >> > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e > ] > >> > > > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > >> > > > ---- > >> > > > - lib/backend/sqlite.c | 8 -------- > >> > > > - 1 file changed, 8 deletions(-) > >> > > > - > >> > > > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > >> > > > -index 5a029d575a..b612732267 100644 > >> > > > ---- a/lib/backend/sqlite.c > >> > > > -+++ b/lib/backend/sqlite.c > >> > > > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, > int argc, sqlite3_value **argv) > >> > > > - sqlite3_result_int(sctx, match); > >> > > > - } > >> > > > - > >> > > > --static void errCb(void *data, int err, const char *msg) > >> > > > --{ > >> > > > -- rpmdb rdb = data; > >> > > > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > >> > > > -- rdb->db_descr, sqlite3_errstr(err), msg); > >> > > > --} > >> > > > -- > >> > > > - static int dbiCursorReset(dbiCursor dbc) > >> > > > - { > >> > > > - if (dbc->stmt) { > >> > > > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char > * dbhome) > >> > > > - * the "database is locked" errors at every cost > >> > > > - */ > >> > > > - sqlite3_busy_timeout(sdb, 10000); > >> > > > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > >> > > > - > >> > > > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > >> > > > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > >> > > > diff --git > a/meta/recipes-devtools/rpm/files/fix-declaration.patch > b/meta/recipes-devtools/rpm/files/fix-declaration.patch > >> > > > deleted file mode 100644 > >> > > > index e5c84ebd498..00000000000 > >> > > > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > >> > > > +++ /dev/null > >> > > > @@ -1,39 +0,0 @@ > >> > > > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 > 00:00:00 2001 > >> > > > -From: Florian Festi <ffesti@redhat.com> > >> > > > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > >> > > > -Subject: [PATCH] Fix compiler error on clang > >> > > > - > >> > > > -Turns out variable declarations are not allowed after a label, > even in > >> > > > -C99. And while some compilers don't seem to care others do. > >> > > > - > >> > > > -Moving the declaration of mayopen to the start of the function > to avoid > >> > > > -this problem. > >> > > > - > >> > > > -Resolves: #2435 > >> > > > -Upstream-Status: Backport [ > https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414 > ] > >> > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > >> > > > ---- > >> > > > - lib/fsm.c | 3 ++- > >> > > > - 1 file changed, 2 insertions(+), 1 deletion(-) > >> > > > - > >> > > > -diff --git a/lib/fsm.c b/lib/fsm.c > >> > > > -index 5671ac642d..183293edb0 100644 > >> > > > ---- a/lib/fsm.c > >> > > > -+++ b/lib/fsm.c > >> > > > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte > te, rpmfiles files, > >> > > > - int nodigest = (rpmtsFlags(ts) & > RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; > >> > > > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : > 0; > >> > > > - int firstlinkfile = -1; > >> > > > -+ int mayopen = 0; > >> > > > - char *tid = NULL; > >> > > > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > >> > > > - struct filedata_s *firstlink = NULL; > >> > > > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte > te, rpmfiles files, > >> > > > - > >> > > > - setmeta: > >> > > > - /* Special files require path-based ops */ > >> > > > -- int mayopen = S_ISREG(fp->sb.st_mode) || > S_ISDIR(fp->sb.st_mode); > >> > > > -+ mayopen = S_ISREG(fp->sb.st_mode) || > S_ISDIR(fp->sb.st_mode); > >> > > > - if (!rc && fd == -1 && mayopen) { > >> > > > - int flags = O_RDONLY; > >> > > > - /* Only follow safe symlinks, and never on > temporary files */ > >> > > > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > >> > > > similarity index 72% > >> > > > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > >> > > > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > >> > > > index 3e85cbb8efe..af11dec5ef3 100644 > >> > > > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > >> > > > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > >> > > > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > >> > > > LICENSE = "GPL-2.0-only" > >> > > > LIC_FILES_CHKSUM = > "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > >> > > > > >> > > > -SRC_URI = "git:// > github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > >> > > > +SRC_URI = "git:// > github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > >> > > > @@ -36,58 +36,51 @@ SRC_URI = "git:// > github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > >> > > > > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > >> > > > > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > >> > > > > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > >> > > > - > file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > >> > > > - > file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > >> > > > - file://fix-declaration.patch \ > >> > > > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > \ > >> > > > - > file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > >> > > > - > file://0001-Fix-missing-basename-include-on-macOS.patch \ > >> > > > + > file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > >> > > > + > file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > >> > > > + > file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > >> > > > + > file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > >> > > > + > file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > >> > > > " > >> > > > > >> > > > PE = "1" > >> > > > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > >> > > > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > >> > > > > >> > > > S = "${WORKDIR}/git" > >> > > > > >> > > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > >> > > > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 > sqlite3 zstd" > >> > > > DEPENDS:append:class-native = " file-replacement-native > bzip2-replacement-native" > >> > > > > >> > > > -inherit autotools gettext pkgconfig python3native > >> > > > -export PYTHON_ABI > >> > > > - > >> > > > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > >> > > > - > >> > > > -# OE-core patches autoreconf to additionally run gnu-configize, > which fails with this recipe > >> > > > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > >> > > > - > >> > > > -# Vendor is detected differently on x86 and aarch64 hosts and > can feed into target packages > >> > > > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt > --with-vendor=pc" > >> > > > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > >> > > > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF > -DENABLE_OPENMP=OFF" > >> > > > > >> > > > # --sysconfdir prevents rpm from attempting to access > machine-specific configuration in sysroot/etc; we need to have it in rootfs > >> > > > # --localstatedir prevents rpm from writing its database to > native sysroot when building images > >> > > > -# Forcibly disable plugins for native/nativesdk, as the inhibit > and prioreset > >> > > > -# plugins both behave badly inside builds. > >> > > > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc > --localstatedir=/var --disable-plugins" > >> > > > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc > --disable-plugins" > >> > > > +EXTRA_OECMAKE:append:class-native = " > -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc > -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > >> > > > +EXTRA_OECMAKE:append:class-nativesdk = " > -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > >> > > > + > >> > > > +inherit cmake gettext pkgconfig python3targetconfig > >> > > > +OECMAKE_GENERATOR = "Unix Makefiles" > >> > > > > >> > > > BBCLASSEXTEND = "native nativesdk" > >> > > > > >> > > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', > 'systemd', 'inhibit', '', d)} sqlite zstd" > >> > > > -# The inhibit plugin serves no purpose outside of the target > >> > > > -PACKAGECONFIG:remove:class-native = "inhibit" > >> > > > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > >> > > > +PACKAGECONFIG ??= "internal-openpgp" > >> > > > > >> > > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > >> > > > -PACKAGECONFIG[inhibit] = > "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > >> > > > -PACKAGECONFIG[rpm2archive] = > "--with-archive,--without-archive,libarchive" > >> > > > -PACKAGECONFIG[sqlite] = > "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > >> > > > -PACKAGECONFIG[readline] = > "--with-readline,--without-readline,readline" > >> > > > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > >> > > > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > >> > > > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > >> > > > +PACKAGECONFIG[plugins] = > "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > >> > > > +PACKAGECONFIG[testsuite] = > "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > >> > > > > >> > > > -ASNEEDED = "" > >> > > > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > >> > > > +PACKAGECONFIG[internal-openpgp] = > "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > >> > > > + > >> > > > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > >> > > > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > >> > > > +PACKAGECONFIG[archive] = > "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > >> > > > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > >> > > > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > >> > > > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > >> > > > +PACKAGECONFIG[fsverity] = > "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > >> > > > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > >> > > > +PACKAGECONFIG[fapolicyd] = > "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > >> > > > +PACKAGECONFIG[readline] = > "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > >> > > > > >> > > > # Direct rpm-native to read configuration from our sysroot, not > the one it was compiled in > >> > > > # libmagic also has sysroot path contamination, so override it > >> > > > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > >> > > > ${libdir}/rpm/rpmdeps \ > >> > > > " > >> > > > > >> > > > -do_configure:prepend() { > >> > > > - mkdir -p ${S}/build-aux > >> > > > -} > >> > > > - > >> > > > do_install:append:class-native() { > >> > > > for tool in ${WRAPPER_TOOLS}; do > >> > > > test -x ${D}$tool && create_wrapper ${D}$tool \ > >> > > > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > >> > > > > >> > > > do_install:append () { > >> > > > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > >> > > > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > >> > > > ${D}/${libdir}/rpm/macros > >> > > > > >> > > > } > >> > > > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > >> > > > ${libdir}/rpm/check-* \ > >> > > > ${libdir}/rpm/sepdebugcrcfix \ > >> > > > ${libdir}/rpm/find-lang.sh \ > >> > > > + ${libdir}/rpm/sysusers.sh \ > >> > > > ${libdir}/rpm/*provides* \ > >> > > > ${libdir}/rpm/*requires* \ > >> > > > ${libdir}/rpm/*deps* \ > >> > > > -- > >> > > > 2.39.2 > >> > > > > >> > > > > >> > > > > >> > > > > >> > > >> > > >> > > >> > >> -=-=-=-=-=-=-=-=-=-=-=- > >> Links: You receive all messages sent to this group. > >> View/Reply Online (#194457): > https://lists.openembedded.org/g/openembedded-core/message/194457 > >> Mute This Topic: https://lists.openembedded.org/mt/103975822/3618418 > >> Group Owner: openembedded-core+owner@lists.openembedded.org > >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub > [matt@madison.systems] > >> -=-=-=-=-=-=-=-=-=-=-=- > >> > [-- Attachment #2: Type: text/html, Size: 103172 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-29 11:57 ` Alexander Kanavin 2024-01-29 12:11 ` Matt Madison @ 2024-01-29 16:44 ` Mark Hatle 1 sibling, 0 replies; 20+ messages in thread From: Mark Hatle @ 2024-01-29 16:44 UTC (permalink / raw) To: openembedded-core On 1/29/24 5:57 AM, Alexander Kanavin wrote: > I sent a patch. > > Alex > > On Sun, 28 Jan 2024 at 20:04, Alexander Kanavin via > lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> > wrote: >> >> 0257: file = file.replace("%", "%%%%%%%%") >> *** 0258: attr = get_attr(file) >> ... >> *** 0203: stat_f = os.stat(rootpath + "/" + path, >> follow_symlinks=False) >> >> Exception: FileNotFoundError: [Errno 2] No such file or directory: >> '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/nodejs/20.8.1/packages-split/nodejs-ptest/usr/lib/nodejs/ptest/test/fixtures/es-modules/test-esm-double-encoding-native%%%%%%%%20.mjs' I think the expansion is still necessary, it's the number of '%' that may not be correct. What I don't remember is if (in that code) what happens if %20 is not a defined macro. Do it use it as a litteral or just "eat it"? %%20 might be the correct format here... but there were recursive processing issues in the past which is how we ended up with: %%%%%%%% to mean "%". --Mark >> >> Seems like 257 and 258 should be swapped. No idea what that % >> replacement is for. >> >> Alex >> >> On Sun, 28 Jan 2024 at 17:54, Khem Raj <raj.khem@gmail.com> wrote: >>> >>> I am seeing some failures in meta-oe ( especially nodejs ) which I >>> suspect are due to rpm upgrade and patches around it. >>> >>> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3566/steps/15/logs/stdio >>> >>> On Fri, Jan 26, 2024 at 5:35 AM Alexander Kanavin >>> <alex.kanavin@gmail.com> wrote: >>>> >>>> Upstream has replaced autoconf with cmake, which necessitates a rewrite of the >>>> recipe and available options, and a rebase to cmake of >>>> 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >>>> >>>> Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : >>>> the patch was removing the NULL marker at the end of function arguments, >>>> and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >>>> was restoring it (in addition to the actual change the patch was making). >>>> Now both patches preserve the NULL terminator. >>>> >>>> Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> --- >>>> ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- >>>> ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ >>>> ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ >>>> ...satisfiable-dependency-when-building.patch | 12 +-- >>>> ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- >>>> ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- >>>> ...-PATH-environment-variable-before-ru.patch | 12 +-- >>>> ...lename-before-passing-it-to-basename.patch | 40 ---------- >>>> ...ix-missing-basename-include-on-macOS.patch | 26 ------- >>>> ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ >>>> ...lling-execute-package-scriptlets-wit.patch | 24 ++---- >>>> ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- >>>> ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- >>>> ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- >>>> .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- >>>> ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- >>>> ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- >>>> ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ >>>> ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ >>>> ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- >>>> ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- >>>> .../rpm/files/fix-declaration.patch | 39 ---------- >>>> .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- >>>> 23 files changed, 328 insertions(+), 383 deletions(-) >>>> create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch >>>> create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch >>>> delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch >>>> delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch >>>> create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch >>>> delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch >>>> delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch >>>> create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch >>>> create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch >>>> delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch >>>> delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch >>>> rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) >>>> >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch >>>> index 9fa486dfd3c..96fe57dfeb8 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch >>>> @@ -1,4 +1,4 @@ >>>> -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 >>>> +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Thu, 9 Mar 2017 18:54:02 +0200 >>>> Subject: [PATCH] Add a color setting for mips64_n32 binaries >>>> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> 2 files changed, 6 insertions(+) >>>> >>>> diff --git a/build/rpmfc.c b/build/rpmfc.c >>>> -index 26606378f..a16e3f4e9 100644 >>>> +index 4b67a9bae..ed7e4e623 100644 >>>> --- a/build/rpmfc.c >>>> +++ b/build/rpmfc.c >>>> -@@ -646,6 +646,7 @@ exit: >>>> +@@ -660,6 +660,7 @@ exit: >>>> static const struct rpmfcTokens_s rpmfcTokens[] = { >>>> { "directory", RPMFC_INCLUDE }, >>>> >>>> @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 >>>> { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, >>>> { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, >>>> >>>> -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) >>>> +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) >>>> color = RPMFC_ELF32; >>>> break; >>>> } >>>> @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 >>>> if (elf) >>>> elf_end(elf); >>>> diff --git a/rpmrc.in b/rpmrc.in >>>> -index 2975a3a0e..c7232b48b 100644 >>>> +index 8646a966b..7349fdfd3 100644 >>>> --- a/rpmrc.in >>>> +++ b/rpmrc.in >>>> -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 >>>> +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 >>>> archcolor: mips64r6 2 >>>> archcolor: mips64r6el 2 >>>> >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch >>>> new file mode 100644 >>>> index 00000000000..5053caae33f >>>> --- /dev/null >>>> +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch >>>> @@ -0,0 +1,28 @@ >>>> +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 >>>> +From: Alexander Kanavin <alex@linutronix.de> >>>> +Date: Wed, 29 Nov 2023 14:06:15 +0100 >>>> +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than >>>> + cmake modules >>>> + >>>> +Otherwise cmake will try to find libm, badly, and fail. >>>> + >>>> +Upstream-Status: Inappropriate [oe-core specific] >>>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> + >>>> +--- >>>> + CMakeLists.txt | 2 +- >>>> + 1 file changed, 1 insertion(+), 1 deletion(-) >>>> + >>>> +diff --git a/CMakeLists.txt b/CMakeLists.txt >>>> +index 7f0630453..d0ea565f3 100644 >>>> +--- a/CMakeLists.txt >>>> ++++ b/CMakeLists.txt >>>> +@@ -187,7 +187,7 @@ set(REQFUNCS >>>> + ) >>>> + >>>> + find_package(PkgConfig REQUIRED) >>>> +-find_package(Lua 5.2 REQUIRED) >>>> ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) >>>> + find_package(ZLIB REQUIRED) >>>> + find_package(BZip2) >>>> + find_package(Iconv) >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch >>>> new file mode 100644 >>>> index 00000000000..db83b176b41 >>>> --- /dev/null >>>> +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch >>>> @@ -0,0 +1,42 @@ >>>> +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 >>>> +From: Alexander Kanavin <alex@linutronix.de> >>>> +Date: Tue, 16 Jan 2024 13:43:36 +0100 >>>> +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit >>>> + option >>>> + >>>> +This was lost in autotools -> cmake transition. The particular >>>> +reason to make it explicit is that readline is gpl version 3 >>>> +licensed, and in some builds components under that license >>>> +need to be excluded. >>>> + >>>> +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] >>>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> +--- >>>> + CMakeLists.txt | 7 ++++++- >>>> + 1 file changed, 6 insertions(+), 1 deletion(-) >>>> + >>>> +diff --git a/CMakeLists.txt b/CMakeLists.txt >>>> +index 0a474106e..89e27417f 100644 >>>> +--- a/CMakeLists.txt >>>> ++++ b/CMakeLists.txt >>>> +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) >>>> + option(WITH_FSVERITY "Build with fsverity support" OFF) >>>> + option(WITH_IMAEVM "Build with IMA support" OFF) >>>> + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) >>>> ++option(WITH_READLINE "Build with readline support" ON) >>>> + >>>> + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") >>>> + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") >>>> +@@ -193,7 +194,11 @@ find_package(BZip2) >>>> + find_package(Iconv) >>>> + >>>> + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) >>>> +-pkg_check_modules(READLINE IMPORTED_TARGET readline) >>>> ++ >>>> ++if (WITH_READLINE) >>>> ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) >>>> ++endif() >>>> ++ >>>> + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) >>>> + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) >>>> + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch >>>> index 8440c3516d6..df5543873c1 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch >>>> @@ -1,4 +1,4 @@ >>>> -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 >>>> +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Mon, 9 Jan 2017 18:52:11 +0200 >>>> Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in >>>> @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> build/pack.c | 4 ---- >>>> 1 file changed, 4 deletions(-) >>>> >>>> -Index: git/build/pack.c >>>> -=================================================================== >>>> ---- git.orig/build/pack.c >>>> -+++ git/build/pack.c >>>> -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, >>>> +diff --git a/build/pack.c b/build/pack.c >>>> +index f7dac6d9a..f382c7da0 100644 >>>> +--- a/build/pack.c >>>> ++++ b/build/pack.c >>>> +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch >>>> headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); >>>> } >>>> >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >>>> index 8fdc5edb10b..b056d19741a 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch >>>> @@ -1,4 +1,4 @@ >>>> -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 >>>> +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Mon, 27 Feb 2017 09:43:30 +0200 >>>> Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for >>>> @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 >>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> >>>> --- >>>> - configure.ac | 2 +- >>>> - macros.in | 2 +- >>>> - rpm.am | 4 ++-- >>>> - 3 files changed, 4 insertions(+), 4 deletions(-) >>>> + CMakeLists.txt | 2 +- >>>> + macros.in | 2 +- >>>> + 2 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> -diff --git a/configure.ac b/configure.ac >>>> -index e6676c581..ec28db9b6 100644 >>>> ---- a/configure.ac >>>> -+++ b/configure.ac >>>> -@@ -942,7 +942,7 @@ else >>>> - usrprefix=$prefix >>>> - fi >>>> +diff --git a/CMakeLists.txt b/CMakeLists.txt >>>> +index 2767915fb..7f0630453 100644 >>>> +--- a/CMakeLists.txt >>>> ++++ b/CMakeLists.txt >>>> +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) >>>> + option(WITH_IMAEVM "Build with IMA support" OFF) >>>> + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) >>>> >>>> --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" >>>> -+RPMCONFIGDIR="`echo ${libdir}/rpm`" >>>> - AC_SUBST(RPMCONFIGDIR) >>>> +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") >>>> ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") >>>> + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") >>>> >>>> - AC_SUBST(OBJDUMP) >>>> + # Emulate libtool versioning. Before a public release: >>>> diff --git a/macros.in b/macros.in >>>> -index a2411d784..735b74d99 100644 >>>> +index b49ffaad4..3acbe78f6 100644 >>>> --- a/macros.in >>>> +++ b/macros.in >>>> -@@ -930,7 +930,7 @@ package or when debugging this package.\ >>>> +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ >>>> %_sharedstatedir %{_prefix}/com >>>> %_localstatedir %{_prefix}/var >>>> %_lib lib >>>> @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 >>>> %_includedir %{_prefix}/include >>>> %_infodir %{_datadir}/info >>>> %_mandir %{_datadir}/man >>>> -diff --git a/rpm.am b/rpm.am >>>> -index 55b5b3935..5a51f102b 100644 >>>> ---- a/rpm.am >>>> -+++ b/rpm.am >>>> -@@ -1,10 +1,10 @@ >>>> - # Internal binaries >>>> - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm >>>> --rpmlibexecdir = $(prefix)/lib/rpm >>>> -+rpmlibexecdir = $(libdir)/rpm >>>> - >>>> - # Host independent config files >>>> - ## HACK: it probably should be $(datadir)/rpm >>>> --rpmconfigdir = $(prefix)/lib/rpm >>>> -+rpmconfigdir = $(libdir)/rpm >>>> - >>>> - # Libtool version (current-revision-age) for all our libraries >>>> - rpm_version_info = 13:0:4 >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch >>>> index fda64eefe01..6a18679da2f 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch >>>> @@ -1,35 +1,36 @@ >>>> -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 >>>> +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Tue, 10 Jan 2017 14:11:30 +0200 >>>> Subject: [PATCH] Do not read config files from $HOME >>>> >>>> Upstream-Status: Inappropriate [oe-core specific] >>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> + >>>> --- >>>> lib/rpmrc.c | 6 ++---- >>>> 1 file changed, 2 insertions(+), 4 deletions(-) >>>> >>>> -Index: git/lib/rpmrc.c >>>> -=================================================================== >>>> ---- git.orig/lib/rpmrc.c >>>> -+++ git/lib/rpmrc.c >>>> +diff --git a/lib/rpmrc.c b/lib/rpmrc.c >>>> +index 269d490ac..f39dcfc11 100644 >>>> +--- a/lib/rpmrc.c >>>> ++++ b/lib/rpmrc.c >>>> @@ -458,8 +458,7 @@ static void setDefaults(void) >>>> if (!defrcfiles) { >>>> defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", >>>> - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", >>>> + confdir, "/" RPM_VENDOR "/rpmrc", ":", >>>> - SYSCONFDIR "/rpmrc", ":", >>>> - "~/.rpmrc", NULL); >>>> -+ SYSCONFDIR "/rpmrc", ":"); >>>> ++ SYSCONFDIR "/rpmrc", NULL); >>>> } >>>> >>>> #ifndef MACROFILES >>>> @@ -471,8 +470,7 @@ static void setDefaults(void) >>>> - confdir, "/" RPMCANONVENDOR "/macros", ":", >>>> + confdir, "/" RPM_VENDOR "/macros", ":", >>>> SYSCONFDIR "/rpm/macros.*", ":", >>>> SYSCONFDIR "/rpm/macros", ":", >>>> - SYSCONFDIR "/rpm/%{_target}/macros", ":", >>>> - "~/.rpmmacros", NULL); >>>> -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); >>>> ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); >>>> } >>>> #else >>>> macrofiles = MACROFILES; >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch >>>> index ae24b663aae..318f65ed375 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch >>>> @@ -1,4 +1,4 @@ >>>> -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 >>>> +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Fri, 20 Jan 2017 13:32:06 +0200 >>>> Subject: [PATCH] Do not reset the PATH environment variable before running >>>> @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> lib/rpmscript.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> -Index: git/lib/rpmscript.c >>>> -=================================================================== >>>> ---- git.orig/lib/rpmscript.c >>>> -+++ git/lib/rpmscript.c >>>> -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar >>>> +diff --git a/lib/rpmscript.c b/lib/rpmscript.c >>>> +index 36e37cf77..37ada014c 100644 >>>> +--- a/lib/rpmscript.c >>>> ++++ b/lib/rpmscript.c >>>> +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, >>>> if (ipath && ipath[5] != '%') >>>> path = ipath; >>>> >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch >>>> deleted file mode 100644 >>>> index f9b809d1676..00000000000 >>>> --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch >>>> +++ /dev/null >>>> @@ -1,40 +0,0 @@ >>>> -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 >>>> -From: Florian Festi <ffesti@redhat.com> >>>> -Date: Wed, 26 Jul 2023 15:01:35 +0200 >>>> -Subject: [PATCH] Duplicate filename before passing it to basename >>>> - >>>> -basename is allowed change the string passed to it. While we don't need >>>> -the filename after that just casting away the const seems a bit too >>>> -hacky. >>>> - >>>> -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] >>>> -Signed-off-by: Khem Raj <raj.khem@gmail.com> >>>> ---- >>>> - tools/rpmuncompress.c | 4 +++- >>>> - 1 file changed, 3 insertions(+), 1 deletion(-) >>>> - >>>> -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c >>>> -index 58ddf5683..e13cc6a66 100644 >>>> ---- a/tools/rpmuncompress.c >>>> -+++ b/tools/rpmuncompress.c >>>> -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) >>>> - if (needtar) { >>>> - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); >>>> - } else if (at->compressed == COMPRESSED_GEM) { >>>> -- const char *bn = basename(fn); >>>> -+ char *tmp = xstrdup(fn); >>>> -+ const char *bn = basename(tmp); >>>> - size_t nvlen = strlen(bn) - 3; >>>> - char *gem = rpmGetPath("%{__gem}", NULL); >>>> - char *gemspec = NULL; >>>> -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) >>>> - >>>> - free(gemspec); >>>> - free(gem); >>>> -+ free(tmp); >>>> - } else { >>>> - rasprintf(&buf, "%s '%s'", zipper, fn); >>>> - } >>>> --- >>>> -2.43.0 >>>> - >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch >>>> deleted file mode 100644 >>>> index a93597a8352..00000000000 >>>> --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch >>>> +++ /dev/null >>>> @@ -1,26 +0,0 @@ >>>> -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 >>>> -From: Calvin Buckley <calvin@cmpct.info> >>>> -Date: Tue, 11 Jul 2023 19:22:41 -0300 >>>> -Subject: [PATCH] Fix missing basename include on macOS >>>> - >>>> -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] >>>> -Signed-off-by: Khem Raj <raj.khem@gmail.com> >>>> ---- >>>> - tools/rpmuncompress.c | 1 + >>>> - 1 file changed, 1 insertion(+) >>>> - >>>> -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c >>>> -index bd4146d54..58ddf5683 100644 >>>> ---- a/tools/rpmuncompress.c >>>> -+++ b/tools/rpmuncompress.c >>>> -@@ -1,6 +1,7 @@ >>>> - #include "system.h" >>>> - >>>> - #include <popt.h> >>>> -+#include <libgen.h> >>>> - #include <errno.h> >>>> - #include <stdio.h> >>>> - #include <string.h> >>>> --- >>>> -2.43.0 >>>> - >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch >>>> new file mode 100644 >>>> index 00000000000..8e73e077049 >>>> --- /dev/null >>>> +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch >>>> @@ -0,0 +1,56 @@ >>>> +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 >>>> +From: Panu Matilainen <pmatilai@redhat.com> >>>> +Date: Mon, 18 Dec 2023 12:25:04 +0200 >>>> +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag >>>> + >>>> +This regressed when we axed our internal glob copy in commit >>>> +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only >>>> +an optimization so we can just skip it if not available. >>>> + >>>> +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] >>>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> +--- >>>> + CMakeLists.txt | 1 + >>>> + config.h.in | 1 + >>>> + rpmio/rpmglob.c | 2 ++ >>>> + 3 files changed, 4 insertions(+) >>>> + >>>> +diff --git a/CMakeLists.txt b/CMakeLists.txt >>>> +index d0ea565f3..0a474106e 100644 >>>> +--- a/CMakeLists.txt >>>> ++++ b/CMakeLists.txt >>>> +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) >>>> + set(HAVE_LIBDW 1) >>>> + endif() >>>> + >>>> ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) >>>> + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) >>>> + if (NOT MAJOR_IN_SYSMACROS) >>>> + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) >>>> +diff --git a/config.h.in b/config.h.in >>>> +index cb97827d0..ab1757a9a 100644 >>>> +--- a/config.h.in >>>> ++++ b/config.h.in >>>> +@@ -100,6 +100,7 @@ >>>> + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ >>>> + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ >>>> + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ >>>> ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ >>>> + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ >>>> + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ >>>> + #cmakedefine RUNDIR @rundir@ >>>> +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c >>>> +index 8276eddb4..243568766 100644 >>>> +--- a/rpmio/rpmglob.c >>>> ++++ b/rpmio/rpmglob.c >>>> +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, >>>> + gflags |= GLOB_BRACE; >>>> + if (home != NULL && strlen(home) > 0) >>>> + gflags |= GLOB_TILDE; >>>> ++#if HAVE_GLOB_ONLYDIR >>>> + if (dir_only) >>>> + gflags |= GLOB_ONLYDIR; >>>> ++#endif >>>> + if (flags & RPMGLOB_NOCHECK) >>>> + gflags |= GLOB_NOCHECK; >>>> + >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch >>>> index bd3314a90f8..fc89b44132b 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch >>>> @@ -1,4 +1,4 @@ >>>> -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 >>>> +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Tue, 17 Jan 2017 14:07:17 +0200 >>>> Subject: [PATCH] When cross-installing, execute package scriptlets without >>>> @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: >>>> >>>> Upstream-Status: Inappropriate [oe-core specific] >>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> + >>>> --- >>>> lib/rpmscript.c | 11 ++++++++--- >>>> 1 file changed, 8 insertions(+), 3 deletions(-) >>>> >>>> -Index: git/lib/rpmscript.c >>>> -=================================================================== >>>> ---- git.orig/lib/rpmscript.c >>>> -+++ git/lib/rpmscript.c >>>> -@@ -18,7 +18,7 @@ >>>> - #include "rpmio/rpmio_internal.h" >>>> - >>>> - #include "lib/rpmplugins.h" /* rpm plugins hooks */ >>>> -- >>>> -+#include "lib/rpmchroot.h" /* rpmChrootOut */ >>>> - #include "debug.h" >>>> - >>>> - struct scriptNextFileFunc_s { >>>> -@@ -427,8 +427,7 @@ exit: >>>> +diff --git a/lib/rpmscript.c b/lib/rpmscript.c >>>> +index b18f851a3..36e37cf77 100644 >>>> +--- a/lib/rpmscript.c >>>> ++++ b/lib/rpmscript.c >>>> +@@ -448,8 +448,7 @@ exit: >>>> Fclose(out); /* XXX dup'd STDOUT_FILENO */ >>>> >>>> if (fn) { >>>> @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c >>>> free(fn); >>>> } >>>> free(mline); >>>> -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int >>>> +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, >>>> >>>> if (rc != RPMRC_FAIL) { >>>> if (script_type & RPMSCRIPTLET_EXEC) { >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch >>>> index 64433abb6a1..5820b2e7e5b 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch >>>> @@ -1,4 +1,4 @@ >>>> -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 >>>> +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex@linutronix.de> >>>> Date: Tue, 31 Aug 2021 10:37:05 +0200 >>>> Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata >>>> @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). >>>> >>>> Upstream-Status: Inappropriate [oe-core specific] >>>> Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> + >>>> --- >>>> build/pack.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> -Index: git/build/pack.c >>>> -=================================================================== >>>> ---- git.orig/build/pack.c >>>> -+++ git/build/pack.c >>>> -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) >>>> +diff --git a/build/pack.c b/build/pack.c >>>> +index f382c7da0..0889dd993 100644 >>>> +--- a/build/pack.c >>>> ++++ b/build/pack.c >>>> +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) >>>> headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); >>>> buf = xstrdup(rpmio_flags); >>>> buf[s - rpmio_flags] = '\0'; >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch >>>> deleted file mode 100644 >>>> index 29b6686a940..00000000000 >>>> --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch >>>> +++ /dev/null >>>> @@ -1,28 +0,0 @@ >>>> -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 >>>> -From: Alexander Kanavin <alex@linutronix.de> >>>> -Date: Thu, 4 Aug 2022 12:15:08 +0200 >>>> -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling >>>> - >>>> -x32 is a 64 bit x86 ABI with 32 bit pointers. >>>> - >>>> -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] >>>> -Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> ---- >>>> - configure.ac | 4 ++++ >>>> - 1 file changed, 4 insertions(+) >>>> - >>>> -Index: git/configure.ac >>>> -=================================================================== >>>> ---- git.orig/configure.ac >>>> -+++ git/configure.ac >>>> -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > >>>> - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` >>>> - host_os_gnu=-gnux32 >>>> - fi >>>> -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then >>>> -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` >>>> -+ host_os_gnu=-gnux32 >>>> -+fi >>>> - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then >>>> - host_os=`echo "${host_os}" | sed 's/-gnu$//'` >>>> - fi >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch >>>> index 82e6567dc74..8b9f1f72944 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch >>>> @@ -1,4 +1,4 @@ >>>> -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 >>>> +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 >>>> From: Changqing Li <changqing.li@windriver.com> >>>> Date: Thu, 7 May 2020 17:40:58 +0800 >>>> Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 >>>> @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". >>>> Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> >>>> >>>> Signed-off-by: Changqing Li <changqing.li@windriver.com> >>>> + >>>> --- >>>> lib/transaction.c | 13 ++++++++++++- >>>> 1 file changed, 12 insertions(+), 1 deletion(-) >>>> >>>> -Index: git/lib/transaction.c >>>> -=================================================================== >>>> ---- git.orig/lib/transaction.c >>>> -+++ git/lib/transaction.c >>>> -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, >>>> +diff --git a/lib/transaction.c b/lib/transaction.c >>>> +index 70d2587ac..b89b30060 100644 >>>> +--- a/lib/transaction.c >>>> ++++ b/lib/transaction.c >>>> +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, >>>> rpmfsSetAction(ofs, ofx, FA_CREATE); >>>> rpmfsSetAction(fs, fx, FA_SKIPCOLOR); >>>> rConflicts = 0; >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch >>>> index a6c58699d36..388694d234f 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch >>>> @@ -1,4 +1,7 @@ >>>> -perl: disable auto requires >>>> +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 >>>> +From: Mark Hatle <mark.hatle@windriver.com> >>>> +Date: Tue, 15 Aug 2017 16:41:57 -0500 >>>> +Subject: [PATCH] perl: disable auto requires >>>> >>>> When generating automatic requirements, it's possible for perl scripts to >>>> declare 'optional' dependencies. These seem to often be incorrect and will >>>> @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] >>>> >>>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> >>>> >>>> -Index: git/fileattrs/perl.attr >>>> -=================================================================== >>>> ---- git.orig/fileattrs/perl.attr >>>> -+++ git/fileattrs/perl.attr >>>> +--- >>>> + fileattrs/perl.attr | 2 +- >>>> + fileattrs/perllib.attr | 2 +- >>>> + 2 files changed, 2 insertions(+), 2 deletions(-) >>>> + >>>> +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr >>>> +index 0daef58d5..81ddf5305 100644 >>>> +--- a/fileattrs/perl.attr >>>> ++++ b/fileattrs/perl.attr >>>> @@ -1,3 +1,3 @@ >>>> -%__perl_requires %{_rpmconfigdir}/perl.req >>>> +#__perl_requires %{_rpmconfigdir}/perl.req >>>> %__perl_magic ^.*[Pp]erl .*$ >>>> %__perl_flags exeonly >>>> -Index: git/fileattrs/perllib.attr >>>> -=================================================================== >>>> ---- git.orig/fileattrs/perllib.attr >>>> -+++ git/fileattrs/perllib.attr >>>> +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr >>>> +index fcad48099..495a28927 100644 >>>> +--- a/fileattrs/perllib.attr >>>> ++++ b/fileattrs/perllib.attr >>>> @@ -1,5 +1,5 @@ >>>> %__perllib_provides %{_rpmconfigdir}/perl.prov >>>> -%__perllib_requires %{_rpmconfigdir}/perl.req >>>> diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch >>>> deleted file mode 100644 >>>> index d0e637191a8..00000000000 >>>> --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch >>>> +++ /dev/null >>>> @@ -1,35 +0,0 @@ >>>> -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 >>>> -From: Khem Raj <raj.khem@gmail.com> >>>> -Date: Fri, 3 Mar 2023 09:54:48 -0800 >>>> -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash >>>> - >>>> -Fixes >>>> -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] >>>> -| hdr_hash, /* tp_hash */ >>>> -| ^~~~~~~~ >>>> - >>>> -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] >>>> -Signed-off-by: Khem Raj <raj.khem@gmail.com> >>>> ---- >>>> - python/header-py.c | 4 ++-- >>>> - 1 file changed, 2 insertions(+), 2 deletions(-) >>>> - >>>> -diff --git a/python/header-py.c b/python/header-py.c >>>> -index 0aed0c9267..c15503f359 100644 >>>> ---- a/python/header-py.c >>>> -+++ b/python/header-py.c >>>> -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) >>>> - "(Oi)", s, RPMTAG_NEVR); >>>> - } >>>> - >>>> --static long hdr_hash(PyObject * h) >>>> -+static Py_hash_t hdr_hash(PyObject * h) >>>> - { >>>> -- return (long) h; >>>> -+ return (Py_hash_t) h; >>>> - } >>>> - >>>> - static PyObject * hdr_reduce(hdrObject *s) >>>> --- >>>> -2.39.2 >>>> - >>>> diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >>>> index 2fe96a839c3..89c23f81975 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch >>>> @@ -1,7 +1,7 @@ >>>> -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 >>>> +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Fri, 20 Jan 2017 13:33:05 +0200 >>>> -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR >>>> +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR >>>> environment variable >>>> >>>> This is needed so that rpm can pick up target-specific configuration >>>> @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. >>>> >>>> Upstream-Status: Inappropriate [oe-core specific] >>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> + >>>> --- >>>> lib/rpmrc.c | 19 ++++++++++++++----- >>>> 1 file changed, 14 insertions(+), 5 deletions(-) >>>> >>>> -Index: git/lib/rpmrc.c >>>> -=================================================================== >>>> ---- git.orig/lib/rpmrc.c >>>> -+++ git/lib/rpmrc.c >>>> -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const >>>> +diff --git a/lib/rpmrc.c b/lib/rpmrc.c >>>> +index f39dcfc11..f27f88753 100644 >>>> +--- a/lib/rpmrc.c >>>> ++++ b/lib/rpmrc.c >>>> +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, >>>> static void setDefaults(void) >>>> { >>>> const char *confdir = rpmConfigDir(); >>>> @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c >>>> + >>>> if (!defrcfiles) { >>>> defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", >>>> - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", >>>> -- SYSCONFDIR "/rpmrc", ":"); >>>> -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); >>>> + confdir, "/" RPM_VENDOR "/rpmrc", ":", >>>> +- SYSCONFDIR "/rpmrc", NULL); >>>> ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); >>>> } >>>> >>>> #ifndef MACROFILES >>>> @@ -468,9 +472,9 @@ static void setDefaults(void) >>>> confdir, "/platform/%{_target}/macros", ":", >>>> confdir, "/fileattrs/*.attr", ":", >>>> - confdir, "/" RPMCANONVENDOR "/macros", ":", >>>> + confdir, "/" RPM_VENDOR "/macros", ":", >>>> - SYSCONFDIR "/rpm/macros.*", ":", >>>> - SYSCONFDIR "/rpm/macros", ":", >>>> -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); >>>> +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); >>>> + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", >>>> + etcconfdir, SYSCONFDIR "/rpm/macros", ":", >>>> -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); >>>> ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); >>>> } >>>> #else >>>> macrofiles = MACROFILES; >>>> -@@ -997,7 +1001,11 @@ static void read_auxv(void) >>>> +@@ -1114,7 +1118,11 @@ static void read_auxv(void) >>>> */ >>>> static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) >>>> { >>>> @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c >>>> static struct utsname un; >>>> char * chptr; >>>> canonEntry canon; >>>> -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, >>>> +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) >>>> >>>> if (arch) *arch = un.machine; >>>> if (os) *os = un.sysname; >>>> diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch >>>> new file mode 100644 >>>> index 00000000000..e7f0adc70c9 >>>> --- /dev/null >>>> +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch >>>> @@ -0,0 +1,26 @@ >>>> +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 >>>> +From: Alexander Kanavin <alex@linutronix.de> >>>> +Date: Wed, 29 Nov 2023 14:09:06 +0100 >>>> +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html >>>> + >>>> +Building html would require doxygen-native. >>>> + >>>> +Upstream-Status: Inappropriate [oe-core specific] >>>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> + >>>> +--- >>>> + docs/CMakeLists.txt | 1 - >>>> + 1 file changed, 1 deletion(-) >>>> + >>>> +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt >>>> +index 52dce7b4e..c01ff7757 100644 >>>> +--- a/docs/CMakeLists.txt >>>> ++++ b/docs/CMakeLists.txt >>>> +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) >>>> + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) >>>> + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) >>>> + endif() >>>> +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) >>>> + >>>> + install(FILES >>>> + README.md >>>> diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch >>>> new file mode 100644 >>>> index 00000000000..3d4b09bedb6 >>>> --- /dev/null >>>> +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch >>>> @@ -0,0 +1,34 @@ >>>> +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 >>>> +From: Alexander Kanavin <alex@linutronix.de> >>>> +Date: Tue, 16 Jan 2024 09:59:26 +0100 >>>> +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C >>>> + library >>>> + >>>> +This addresses musl failures; if there is code out there relying on >>>> +those braces, it needs to be fixed when used on musl. >>>> + >>>> +This is unlikely to be trivially fixable upstream. >>>> + >>>> +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] >>>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> +--- >>>> + rpmio/rpmglob.c | 6 ++++++ >>>> + 1 file changed, 6 insertions(+) >>>> + >>>> +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c >>>> +index 243568766..43c27074a 100644 >>>> +--- a/rpmio/rpmglob.c >>>> ++++ b/rpmio/rpmglob.c >>>> +@@ -33,6 +33,12 @@ >>>> + >>>> + #include "debug.h" >>>> + >>>> ++/* Don't fail if the standard C library >>>> +++ * doesn't provide brace expansion */ >>>> ++#ifndef GLOB_BRACE >>>> ++#define GLOB_BRACE 0 >>>> ++#endif >>>> ++ >>>> + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ >>>> + static int ismagic(const char *pattern) >>>> + { >>>> diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch >>>> index 9dbe7125ded..b3d57cc8703 100644 >>>> --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch >>>> +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch >>>> @@ -1,4 +1,4 @@ >>>> -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 >>>> +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 >>>> From: Alexander Kanavin <alex.kanavin@gmail.com> >>>> Date: Thu, 10 Jan 2019 18:14:18 +0100 >>>> Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO >>>> @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. >>>> >>>> Upstream-Status: Inappropriate [oe-core specific] >>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> + >>>> --- >>>> lib/rpmscript.c | 8 ++++---- >>>> 1 file changed, 4 insertions(+), 4 deletions(-) >>>> >>>> -Index: git/lib/rpmscript.c >>>> -=================================================================== >>>> ---- git.orig/lib/rpmscript.c >>>> -+++ git/lib/rpmscript.c >>>> -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm >>>> +diff --git a/lib/rpmscript.c b/lib/rpmscript.c >>>> +index 37ada014c..bab0c97a6 100644 >>>> +--- a/lib/rpmscript.c >>>> ++++ b/lib/rpmscript.c >>>> +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) >>>> if (Ferror(fd)) >>>> goto exit; >>>> >>>> @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c >>>> static const char set_x[] = "set -x\n"; >>>> /* Assume failures will be caught by the write below */ >>>> Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); >>>> -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu >>>> +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, >>>> char *mline = NULL; >>>> rpmRC rc = RPMRC_FAIL; >>>> >>>> @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c >>>> >>>> if (script) { >>>> fn = writeScript(*argvp[0], script); >>>> -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu >>>> +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, >>>> sname, strerror(errno)); >>>> goto exit; >>>> } else if (pid == 0) {/* Child */ >>>> @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c >>>> sname, *argvp[0], (unsigned)getpid()); >>>> >>>> fclose(in); >>>> -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu >>>> +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, >>>> reaped = waitpid(pid, &status, 0); >>>> } while (reaped == -1 && errno == EINTR); >>>> >>>> diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch >>>> deleted file mode 100644 >>>> index 470dda1dcfb..00000000000 >>>> --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch >>>> +++ /dev/null >>>> @@ -1,51 +0,0 @@ >>>> -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 >>>> -From: Panu Matilainen <pmatilai@redhat.com> >>>> -Date: Mon, 26 Jun 2023 12:45:09 +0300 >>>> -Subject: [PATCH] Don't muck with per-process global sqlite configuration from >>>> - the db backend >>>> - >>>> -sqlite3_config() affects all in-process uses of sqlite. librpm being a >>>> -low-level library, it has no business whatsoever making such decisions >>>> -for the applications running on top of it. Besides that, the callback can >>>> -easily end up pointing to an already closed database, causing an >>>> -innocent API user to crash in librpm on an entirely unrelated error on >>>> -some other database. "Oops." >>>> - >>>> -The sqlite API doesn't seem to provide any per-db or non-global context >>>> -for logging errors, thus we can only remove the call and let sqlite output >>>> -errors the way it pleases (print through stderr, presumably). >>>> - >>>> -Thanks to Jan Palus for spotting and reporting! >>>> - >>>> -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] >>>> -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> >>>> ---- >>>> - lib/backend/sqlite.c | 8 -------- >>>> - 1 file changed, 8 deletions(-) >>>> - >>>> -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c >>>> -index 5a029d575a..b612732267 100644 >>>> ---- a/lib/backend/sqlite.c >>>> -+++ b/lib/backend/sqlite.c >>>> -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) >>>> - sqlite3_result_int(sctx, match); >>>> - } >>>> - >>>> --static void errCb(void *data, int err, const char *msg) >>>> --{ >>>> -- rpmdb rdb = data; >>>> -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", >>>> -- rdb->db_descr, sqlite3_errstr(err), msg); >>>> --} >>>> -- >>>> - static int dbiCursorReset(dbiCursor dbc) >>>> - { >>>> - if (dbc->stmt) { >>>> -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) >>>> - * the "database is locked" errors at every cost >>>> - */ >>>> - sqlite3_busy_timeout(sdb, 10000); >>>> -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); >>>> - >>>> - sqlexec(sdb, "PRAGMA secure_delete = OFF"); >>>> - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); >>>> diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch >>>> deleted file mode 100644 >>>> index e5c84ebd498..00000000000 >>>> --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch >>>> +++ /dev/null >>>> @@ -1,39 +0,0 @@ >>>> -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 >>>> -From: Florian Festi <ffesti@redhat.com> >>>> -Date: Thu, 16 Mar 2023 19:05:04 +0100 >>>> -Subject: [PATCH] Fix compiler error on clang >>>> - >>>> -Turns out variable declarations are not allowed after a label, even in >>>> -C99. And while some compilers don't seem to care others do. >>>> - >>>> -Moving the declaration of mayopen to the start of the function to avoid >>>> -this problem. >>>> - >>>> -Resolves: #2435 >>>> -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] >>>> -Signed-off-by: Alexander Kanavin <alex@linutronix.de> >>>> ---- >>>> - lib/fsm.c | 3 ++- >>>> - 1 file changed, 2 insertions(+), 1 deletion(-) >>>> - >>>> -diff --git a/lib/fsm.c b/lib/fsm.c >>>> -index 5671ac642d..183293edb0 100644 >>>> ---- a/lib/fsm.c >>>> -+++ b/lib/fsm.c >>>> -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, >>>> - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; >>>> - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; >>>> - int firstlinkfile = -1; >>>> -+ int mayopen = 0; >>>> - char *tid = NULL; >>>> - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); >>>> - struct filedata_s *firstlink = NULL; >>>> -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, >>>> - >>>> - setmeta: >>>> - /* Special files require path-based ops */ >>>> -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); >>>> -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); >>>> - if (!rc && fd == -1 && mayopen) { >>>> - int flags = O_RDONLY; >>>> - /* Only follow safe symlinks, and never on temporary files */ >>>> diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb >>>> similarity index 72% >>>> rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb >>>> rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb >>>> index 3e85cbb8efe..af11dec5ef3 100644 >>>> --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb >>>> +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb >>>> @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" >>>> LICENSE = "GPL-2.0-only" >>>> LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" >>>> >>>> -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ >>>> +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ >>>> @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc >>>> file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ >>>> file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ >>>> file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ >>>> - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ >>>> - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ >>>> - file://fix-declaration.patch \ >>>> - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ >>>> - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ >>>> - file://0001-Fix-missing-basename-include-on-macOS.patch \ >>>> + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ >>>> + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ >>>> + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ >>>> + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ >>>> + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ >>>> " >>>> >>>> PE = "1" >>>> -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" >>>> +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" >>>> >>>> S = "${WORKDIR}/git" >>>> >>>> -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" >>>> +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" >>>> DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" >>>> >>>> -inherit autotools gettext pkgconfig python3native >>>> -export PYTHON_ABI >>>> - >>>> -AUTOTOOLS_AUXDIR = "${S}/build-aux" >>>> - >>>> -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe >>>> -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" >>>> - >>>> -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages >>>> -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" >>>> -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" >>>> +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" >>>> >>>> # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs >>>> # --localstatedir prevents rpm from writing its database to native sysroot when building images >>>> -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset >>>> -# plugins both behave badly inside builds. >>>> -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" >>>> -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" >>>> +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" >>>> +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" >>>> + >>>> +inherit cmake gettext pkgconfig python3targetconfig >>>> +OECMAKE_GENERATOR = "Unix Makefiles" >>>> >>>> BBCLASSEXTEND = "native nativesdk" >>>> >>>> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" >>>> -# The inhibit plugin serves no purpose outside of the target >>>> -PACKAGECONFIG:remove:class-native = "inhibit" >>>> -PACKAGECONFIG:remove:class-nativesdk = "inhibit" >>>> +PACKAGECONFIG ??= "internal-openpgp" >>>> >>>> -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" >>>> -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" >>>> -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" >>>> -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" >>>> -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" >>>> -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" >>>> -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" >>>> -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" >>>> +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" >>>> +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" >>>> >>>> -ASNEEDED = "" >>>> +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia >>>> +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" >>>> + >>>> +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" >>>> +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" >>>> +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" >>>> +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" >>>> +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" >>>> +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" >>>> +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" >>>> +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" >>>> +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" >>>> +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" >>>> >>>> # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in >>>> # libmagic also has sysroot path contamination, so override it >>>> @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ >>>> ${libdir}/rpm/rpmdeps \ >>>> " >>>> >>>> -do_configure:prepend() { >>>> - mkdir -p ${S}/build-aux >>>> -} >>>> - >>>> do_install:append:class-native() { >>>> for tool in ${WRAPPER_TOOLS}; do >>>> test -x ${D}$tool && create_wrapper ${D}$tool \ >>>> @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { >>>> >>>> do_install:append () { >>>> sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ >>>> + -e 's:${STAGING_DIR_NATIVE}/::g' \ >>>> ${D}/${libdir}/rpm/macros >>>> >>>> } >>>> @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ >>>> ${libdir}/rpm/check-* \ >>>> ${libdir}/rpm/sepdebugcrcfix \ >>>> ${libdir}/rpm/find-lang.sh \ >>>> + ${libdir}/rpm/sysusers.sh \ >>>> ${libdir}/rpm/*provides* \ >>>> ${libdir}/rpm/*requires* \ >>>> ${libdir}/rpm/*deps* \ >>>> -- >>>> 2.39.2 >>>> >>>> >>>> >>>> >> >> >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#194457): https://lists.openembedded.org/g/openembedded-core/message/194457 >> Mute This Topic: https://lists.openembedded.org/mt/103975822/3616948 >> Group Owner: openembedded-core+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mark.hatle@kernel.crashing.org] >> -=-=-=-=-=-=-=-=-=-=-=- >> ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-01-26 13:34 ` [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 Alexander Kanavin 2024-01-28 16:53 ` [OE-core] " Khem Raj @ 2024-02-01 21:10 ` Alexandre Belloni 2024-02-01 21:19 ` Alexander Kanavin [not found] ` <17AFD9EAEAF14DA0.1968@lists.openembedded.org> 1 sibling, 2 replies; 20+ messages in thread From: Alexandre Belloni @ 2024-02-01 21:10 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-core, Alexander Kanavin You are going to love this one, rpm 4.19.1 is not reproducible: https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20240201-8dcic6ea/packages/diff-html/ On 26/01/2024 14:34:55+0100, Alexander Kanavin wrote: > Upstream has replaced autoconf with cmake, which necessitates a rewrite of the > recipe and available options, and a rebase to cmake of > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : > the patch was removing the NULL marker at the end of function arguments, > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > was restoring it (in addition to the actual change the patch was making). > Now both patches preserve the NULL terminator. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > ...satisfiable-dependency-when-building.patch | 12 +-- > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > ...-PATH-environment-variable-before-ru.patch | 12 +-- > ...lename-before-passing-it-to-basename.patch | 40 ---------- > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > .../rpm/files/fix-declaration.patch | 39 ---------- > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- > 23 files changed, 328 insertions(+), 383 deletions(-) > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) > > diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > index 9fa486dfd3c..96fe57dfeb8 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > @@ -1,4 +1,4 @@ > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Thu, 9 Mar 2017 18:54:02 +0200 > Subject: [PATCH] Add a color setting for mips64_n32 binaries > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > 2 files changed, 6 insertions(+) > > diff --git a/build/rpmfc.c b/build/rpmfc.c > -index 26606378f..a16e3f4e9 100644 > +index 4b67a9bae..ed7e4e623 100644 > --- a/build/rpmfc.c > +++ b/build/rpmfc.c > -@@ -646,6 +646,7 @@ exit: > +@@ -660,6 +660,7 @@ exit: > static const struct rpmfcTokens_s rpmfcTokens[] = { > { "directory", RPMFC_INCLUDE }, > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > color = RPMFC_ELF32; > break; > } > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > if (elf) > elf_end(elf); > diff --git a/rpmrc.in b/rpmrc.in > -index 2975a3a0e..c7232b48b 100644 > +index 8646a966b..7349fdfd3 100644 > --- a/rpmrc.in > +++ b/rpmrc.in > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > archcolor: mips64r6 2 > archcolor: mips64r6el 2 > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > new file mode 100644 > index 00000000000..5053caae33f > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > @@ -0,0 +1,28 @@ > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than > + cmake modules > + > +Otherwise cmake will try to find libm, badly, and fail. > + > +Upstream-Status: Inappropriate [oe-core specific] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > + > +--- > + CMakeLists.txt | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 7f0630453..d0ea565f3 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -187,7 +187,7 @@ set(REQFUNCS > + ) > + > + find_package(PkgConfig REQUIRED) > +-find_package(Lua 5.2 REQUIRED) > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > + find_package(ZLIB REQUIRED) > + find_package(BZip2) > + find_package(Iconv) > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > new file mode 100644 > index 00000000000..db83b176b41 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > @@ -0,0 +1,42 @@ > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit > + option > + > +This was lost in autotools -> cmake transition. The particular > +reason to make it explicit is that readline is gpl version 3 > +licensed, and in some builds components under that license > +need to be excluded. > + > +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > +--- > + CMakeLists.txt | 7 ++++++- > + 1 file changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 0a474106e..89e27417f 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) > + option(WITH_FSVERITY "Build with fsverity support" OFF) > + option(WITH_IMAEVM "Build with IMA support" OFF) > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > ++option(WITH_READLINE "Build with readline support" ON) > + > + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > +@@ -193,7 +194,11 @@ find_package(BZip2) > + find_package(Iconv) > + > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > ++ > ++if (WITH_READLINE) > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) > ++endif() > ++ > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > index 8440c3516d6..df5543873c1 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > @@ -1,4 +1,4 @@ > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Mon, 9 Jan 2017 18:52:11 +0200 > Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > build/pack.c | 4 ---- > 1 file changed, 4 deletions(-) > > -Index: git/build/pack.c > -=================================================================== > ---- git.orig/build/pack.c > -+++ git/build/pack.c > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > +diff --git a/build/pack.c b/build/pack.c > +index f7dac6d9a..f382c7da0 100644 > +--- a/build/pack.c > ++++ b/build/pack.c > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); > } > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > index 8fdc5edb10b..b056d19741a 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > @@ -1,4 +1,4 @@ > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Mon, 27 Feb 2017 09:43:30 +0200 > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for > @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > --- > - configure.ac | 2 +- > - macros.in | 2 +- > - rpm.am | 4 ++-- > - 3 files changed, 4 insertions(+), 4 deletions(-) > + CMakeLists.txt | 2 +- > + macros.in | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > > -diff --git a/configure.ac b/configure.ac > -index e6676c581..ec28db9b6 100644 > ---- a/configure.ac > -+++ b/configure.ac > -@@ -942,7 +942,7 @@ else > - usrprefix=$prefix > - fi > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 2767915fb..7f0630453 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) > + option(WITH_IMAEVM "Build with IMA support" OFF) > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > - AC_SUBST(RPMCONFIGDIR) > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") > ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > - AC_SUBST(OBJDUMP) > + # Emulate libtool versioning. Before a public release: > diff --git a/macros.in b/macros.in > -index a2411d784..735b74d99 100644 > +index b49ffaad4..3acbe78f6 100644 > --- a/macros.in > +++ b/macros.in > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ > %_sharedstatedir %{_prefix}/com > %_localstatedir %{_prefix}/var > %_lib lib > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > %_includedir %{_prefix}/include > %_infodir %{_datadir}/info > %_mandir %{_datadir}/man > -diff --git a/rpm.am b/rpm.am > -index 55b5b3935..5a51f102b 100644 > ---- a/rpm.am > -+++ b/rpm.am > -@@ -1,10 +1,10 @@ > - # Internal binaries > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm > --rpmlibexecdir = $(prefix)/lib/rpm > -+rpmlibexecdir = $(libdir)/rpm > - > - # Host independent config files > - ## HACK: it probably should be $(datadir)/rpm > --rpmconfigdir = $(prefix)/lib/rpm > -+rpmconfigdir = $(libdir)/rpm > - > - # Libtool version (current-revision-age) for all our libraries > - rpm_version_info = 13:0:4 > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > index fda64eefe01..6a18679da2f 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > @@ -1,35 +1,36 @@ > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Tue, 10 Jan 2017 14:11:30 +0200 > Subject: [PATCH] Do not read config files from $HOME > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmrc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > -Index: git/lib/rpmrc.c > -=================================================================== > ---- git.orig/lib/rpmrc.c > -+++ git/lib/rpmrc.c > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > +index 269d490ac..f39dcfc11 100644 > +--- a/lib/rpmrc.c > ++++ b/lib/rpmrc.c > @@ -458,8 +458,7 @@ static void setDefaults(void) > if (!defrcfiles) { > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > - SYSCONFDIR "/rpmrc", ":", > - "~/.rpmrc", NULL); > -+ SYSCONFDIR "/rpmrc", ":"); > ++ SYSCONFDIR "/rpmrc", NULL); > } > > #ifndef MACROFILES > @@ -471,8 +470,7 @@ static void setDefaults(void) > - confdir, "/" RPMCANONVENDOR "/macros", ":", > + confdir, "/" RPM_VENDOR "/macros", ":", > SYSCONFDIR "/rpm/macros.*", ":", > SYSCONFDIR "/rpm/macros", ":", > - SYSCONFDIR "/rpm/%{_target}/macros", ":", > - "~/.rpmmacros", NULL); > -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); > ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); > } > #else > macrofiles = MACROFILES; > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > index ae24b663aae..318f65ed375 100644 > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > @@ -1,4 +1,4 @@ > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Fri, 20 Jan 2017 13:32:06 +0200 > Subject: [PATCH] Do not reset the PATH environment variable before running > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > lib/rpmscript.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -Index: git/lib/rpmscript.c > -=================================================================== > ---- git.orig/lib/rpmscript.c > -+++ git/lib/rpmscript.c > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > +index 36e37cf77..37ada014c 100644 > +--- a/lib/rpmscript.c > ++++ b/lib/rpmscript.c > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, > if (ipath && ipath[5] != '%') > path = ipath; > > diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > deleted file mode 100644 > index f9b809d1676..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > +++ /dev/null > @@ -1,40 +0,0 @@ > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 > -From: Florian Festi <ffesti@redhat.com> > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > -Subject: [PATCH] Duplicate filename before passing it to basename > - > -basename is allowed change the string passed to it. While we don't need > -the filename after that just casting away the const seems a bit too > -hacky. > - > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - tools/rpmuncompress.c | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > -index 58ddf5683..e13cc6a66 100644 > ---- a/tools/rpmuncompress.c > -+++ b/tools/rpmuncompress.c > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > - if (needtar) { > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); > - } else if (at->compressed == COMPRESSED_GEM) { > -- const char *bn = basename(fn); > -+ char *tmp = xstrdup(fn); > -+ const char *bn = basename(tmp); > - size_t nvlen = strlen(bn) - 3; > - char *gem = rpmGetPath("%{__gem}", NULL); > - char *gemspec = NULL; > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > - > - free(gemspec); > - free(gem); > -+ free(tmp); > - } else { > - rasprintf(&buf, "%s '%s'", zipper, fn); > - } > --- > -2.43.0 > - > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > deleted file mode 100644 > index a93597a8352..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 > -From: Calvin Buckley <calvin@cmpct.info> > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > -Subject: [PATCH] Fix missing basename include on macOS > - > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - tools/rpmuncompress.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > -index bd4146d54..58ddf5683 100644 > ---- a/tools/rpmuncompress.c > -+++ b/tools/rpmuncompress.c > -@@ -1,6 +1,7 @@ > - #include "system.h" > - > - #include <popt.h> > -+#include <libgen.h> > - #include <errno.h> > - #include <stdio.h> > - #include <string.h> > --- > -2.43.0 > - > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > new file mode 100644 > index 00000000000..8e73e077049 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > @@ -0,0 +1,56 @@ > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 > +From: Panu Matilainen <pmatilai@redhat.com> > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag > + > +This regressed when we axed our internal glob copy in commit > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only > +an optimization so we can just skip it if not available. > + > +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > +--- > + CMakeLists.txt | 1 + > + config.h.in | 1 + > + rpmio/rpmglob.c | 2 ++ > + 3 files changed, 4 insertions(+) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index d0ea565f3..0a474106e 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > + set(HAVE_LIBDW 1) > + endif() > + > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > + if (NOT MAJOR_IN_SYSMACROS) > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > +diff --git a/config.h.in b/config.h.in > +index cb97827d0..ab1757a9a 100644 > +--- a/config.h.in > ++++ b/config.h.in > +@@ -100,6 +100,7 @@ > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > + #cmakedefine RUNDIR @rundir@ > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > +index 8276eddb4..243568766 100644 > +--- a/rpmio/rpmglob.c > ++++ b/rpmio/rpmglob.c > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, > + gflags |= GLOB_BRACE; > + if (home != NULL && strlen(home) > 0) > + gflags |= GLOB_TILDE; > ++#if HAVE_GLOB_ONLYDIR > + if (dir_only) > + gflags |= GLOB_ONLYDIR; > ++#endif > + if (flags & RPMGLOB_NOCHECK) > + gflags |= GLOB_NOCHECK; > + > diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > index bd3314a90f8..fc89b44132b 100644 > --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > @@ -1,4 +1,4 @@ > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Tue, 17 Jan 2017 14:07:17 +0200 > Subject: [PATCH] When cross-installing, execute package scriptlets without > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmscript.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > -Index: git/lib/rpmscript.c > -=================================================================== > ---- git.orig/lib/rpmscript.c > -+++ git/lib/rpmscript.c > -@@ -18,7 +18,7 @@ > - #include "rpmio/rpmio_internal.h" > - > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > -- > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > - #include "debug.h" > - > - struct scriptNextFileFunc_s { > -@@ -427,8 +427,7 @@ exit: > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > +index b18f851a3..36e37cf77 100644 > +--- a/lib/rpmscript.c > ++++ b/lib/rpmscript.c > +@@ -448,8 +448,7 @@ exit: > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > > if (fn) { > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > free(fn); > } > free(mline); > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, > > if (rc != RPMRC_FAIL) { > if (script_type & RPMSCRIPTLET_EXEC) { > diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > index 64433abb6a1..5820b2e7e5b 100644 > --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > @@ -1,4 +1,4 @@ > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex@linutronix.de> > Date: Tue, 31 Aug 2021 10:37:05 +0200 > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > + > --- > build/pack.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > -Index: git/build/pack.c > -=================================================================== > ---- git.orig/build/pack.c > -+++ git/build/pack.c > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > +diff --git a/build/pack.c b/build/pack.c > +index f382c7da0..0889dd993 100644 > +--- a/build/pack.c > ++++ b/build/pack.c > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); > buf = xstrdup(rpmio_flags); > buf[s - rpmio_flags] = '\0'; > diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > deleted file mode 100644 > index 29b6686a940..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex@linutronix.de> > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling > - > -x32 is a 64 bit x86 ABI with 32 bit pointers. > - > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - configure.ac | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -Index: git/configure.ac > -=================================================================== > ---- git.orig/configure.ac > -+++ git/configure.ac > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > - host_os_gnu=-gnux32 > - fi > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > -+ host_os_gnu=-gnux32 > -+fi > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > - fi > diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > index 82e6567dc74..8b9f1f72944 100644 > --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > @@ -1,4 +1,4 @@ > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 > From: Changqing Li <changqing.li@windriver.com> > Date: Thu, 7 May 2020 17:40:58 +0800 > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". > Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > + > --- > lib/transaction.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > -Index: git/lib/transaction.c > -=================================================================== > ---- git.orig/lib/transaction.c > -+++ git/lib/transaction.c > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > +diff --git a/lib/transaction.c b/lib/transaction.c > +index 70d2587ac..b89b30060 100644 > +--- a/lib/transaction.c > ++++ b/lib/transaction.c > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > rpmfsSetAction(ofs, ofx, FA_CREATE); > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > rConflicts = 0; > diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > index a6c58699d36..388694d234f 100644 > --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > @@ -1,4 +1,7 @@ > -perl: disable auto requires > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 > +From: Mark Hatle <mark.hatle@windriver.com> > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > +Subject: [PATCH] perl: disable auto requires > > When generating automatic requirements, it's possible for perl scripts to > declare 'optional' dependencies. These seem to often be incorrect and will > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > -Index: git/fileattrs/perl.attr > -=================================================================== > ---- git.orig/fileattrs/perl.attr > -+++ git/fileattrs/perl.attr > +--- > + fileattrs/perl.attr | 2 +- > + fileattrs/perllib.attr | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > +index 0daef58d5..81ddf5305 100644 > +--- a/fileattrs/perl.attr > ++++ b/fileattrs/perl.attr > @@ -1,3 +1,3 @@ > -%__perl_requires %{_rpmconfigdir}/perl.req > +#__perl_requires %{_rpmconfigdir}/perl.req > %__perl_magic ^.*[Pp]erl .*$ > %__perl_flags exeonly > -Index: git/fileattrs/perllib.attr > -=================================================================== > ---- git.orig/fileattrs/perllib.attr > -+++ git/fileattrs/perllib.attr > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > +index fcad48099..495a28927 100644 > +--- a/fileattrs/perllib.attr > ++++ b/fileattrs/perllib.attr > @@ -1,5 +1,5 @@ > %__perllib_provides %{_rpmconfigdir}/perl.prov > -%__perllib_requires %{_rpmconfigdir}/perl.req > diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > deleted file mode 100644 > index d0e637191a8..00000000000 > --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 > -From: Khem Raj <raj.khem@gmail.com> > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash > - > -Fixes > -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] > -| hdr_hash, /* tp_hash */ > -| ^~~~~~~~ > - > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > ---- > - python/header-py.c | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/python/header-py.c b/python/header-py.c > -index 0aed0c9267..c15503f359 100644 > ---- a/python/header-py.c > -+++ b/python/header-py.c > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) > - "(Oi)", s, RPMTAG_NEVR); > - } > - > --static long hdr_hash(PyObject * h) > -+static Py_hash_t hdr_hash(PyObject * h) > - { > -- return (long) h; > -+ return (Py_hash_t) h; > - } > - > - static PyObject * hdr_reduce(hdrObject *s) > --- > -2.39.2 > - > diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > index 2fe96a839c3..89c23f81975 100644 > --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > @@ -1,7 +1,7 @@ > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Fri, 20 Jan 2017 13:33:05 +0200 > -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR > +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR > environment variable > > This is needed so that rpm can pick up target-specific configuration > @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmrc.c | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > -Index: git/lib/rpmrc.c > -=================================================================== > ---- git.orig/lib/rpmrc.c > -+++ git/lib/rpmrc.c > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > +index f39dcfc11..f27f88753 100644 > +--- a/lib/rpmrc.c > ++++ b/lib/rpmrc.c > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, > static void setDefaults(void) > { > const char *confdir = rpmConfigDir(); > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > + > if (!defrcfiles) { > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > -- SYSCONFDIR "/rpmrc", ":"); > -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > +- SYSCONFDIR "/rpmrc", NULL); > ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); > } > > #ifndef MACROFILES > @@ -468,9 +472,9 @@ static void setDefaults(void) > confdir, "/platform/%{_target}/macros", ":", > confdir, "/fileattrs/*.attr", ":", > - confdir, "/" RPMCANONVENDOR "/macros", ":", > + confdir, "/" RPM_VENDOR "/macros", ":", > - SYSCONFDIR "/rpm/macros.*", ":", > - SYSCONFDIR "/rpm/macros", ":", > -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); > +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); > + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", > + etcconfdir, SYSCONFDIR "/rpm/macros", ":", > -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); > ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); > } > #else > macrofiles = MACROFILES; > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > */ > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > { > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > static struct utsname un; > char * chptr; > canonEntry canon; > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > if (arch) *arch = un.machine; > if (os) *os = un.sysname; > diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > new file mode 100644 > index 00000000000..e7f0adc70c9 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > @@ -0,0 +1,26 @@ > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html > + > +Building html would require doxygen-native. > + > +Upstream-Status: Inappropriate [oe-core specific] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > + > +--- > + docs/CMakeLists.txt | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > +index 52dce7b4e..c01ff7757 100644 > +--- a/docs/CMakeLists.txt > ++++ b/docs/CMakeLists.txt > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > + endif() > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) > + > + install(FILES > + README.md > diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > new file mode 100644 > index 00000000000..3d4b09bedb6 > --- /dev/null > +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > @@ -0,0 +1,34 @@ > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex@linutronix.de> > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C > + library > + > +This addresses musl failures; if there is code out there relying on > +those braces, it needs to be fixed when used on musl. > + > +This is unlikely to be trivially fixable upstream. > + > +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > +--- > + rpmio/rpmglob.c | 6 ++++++ > + 1 file changed, 6 insertions(+) > + > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > +index 243568766..43c27074a 100644 > +--- a/rpmio/rpmglob.c > ++++ b/rpmio/rpmglob.c > +@@ -33,6 +33,12 @@ > + > + #include "debug.h" > + > ++/* Don't fail if the standard C library > +++ * doesn't provide brace expansion */ > ++#ifndef GLOB_BRACE > ++#define GLOB_BRACE 0 > ++#endif > ++ > + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ > + static int ismagic(const char *pattern) > + { > diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > index 9dbe7125ded..b3d57cc8703 100644 > --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > @@ -1,4 +1,4 @@ > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Thu, 10 Jan 2019 18:14:18 +0100 > Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > > Upstream-Status: Inappropriate [oe-core specific] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > lib/rpmscript.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > -Index: git/lib/rpmscript.c > -=================================================================== > ---- git.orig/lib/rpmscript.c > -+++ git/lib/rpmscript.c > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > +index 37ada014c..bab0c97a6 100644 > +--- a/lib/rpmscript.c > ++++ b/lib/rpmscript.c > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) > if (Ferror(fd)) > goto exit; > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > static const char set_x[] = "set -x\n"; > /* Assume failures will be caught by the write below */ > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > char *mline = NULL; > rpmRC rc = RPMRC_FAIL; > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > > if (script) { > fn = writeScript(*argvp[0], script); > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > sname, strerror(errno)); > goto exit; > } else if (pid == 0) {/* Child */ > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > sname, *argvp[0], (unsigned)getpid()); > > fclose(in); > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > reaped = waitpid(pid, &status, 0); > } while (reaped == -1 && errno == EINTR); > > diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > deleted file mode 100644 > index 470dda1dcfb..00000000000 > --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > +++ /dev/null > @@ -1,51 +0,0 @@ > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 > -From: Panu Matilainen <pmatilai@redhat.com> > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > -Subject: [PATCH] Don't muck with per-process global sqlite configuration from > - the db backend > - > -sqlite3_config() affects all in-process uses of sqlite. librpm being a > -low-level library, it has no business whatsoever making such decisions > -for the applications running on top of it. Besides that, the callback can > -easily end up pointing to an already closed database, causing an > -innocent API user to crash in librpm on an entirely unrelated error on > -some other database. "Oops." > - > -The sqlite API doesn't seem to provide any per-db or non-global context > -for logging errors, thus we can only remove the call and let sqlite output > -errors the way it pleases (print through stderr, presumably). > - > -Thanks to Jan Palus for spotting and reporting! > - > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > ---- > - lib/backend/sqlite.c | 8 -------- > - 1 file changed, 8 deletions(-) > - > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > -index 5a029d575a..b612732267 100644 > ---- a/lib/backend/sqlite.c > -+++ b/lib/backend/sqlite.c > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) > - sqlite3_result_int(sctx, match); > - } > - > --static void errCb(void *data, int err, const char *msg) > --{ > -- rpmdb rdb = data; > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > -- rdb->db_descr, sqlite3_errstr(err), msg); > --} > -- > - static int dbiCursorReset(dbiCursor dbc) > - { > - if (dbc->stmt) { > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) > - * the "database is locked" errors at every cost > - */ > - sqlite3_busy_timeout(sdb, 10000); > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > - > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch > deleted file mode 100644 > index e5c84ebd498..00000000000 > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 > -From: Florian Festi <ffesti@redhat.com> > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > -Subject: [PATCH] Fix compiler error on clang > - > -Turns out variable declarations are not allowed after a label, even in > -C99. And while some compilers don't seem to care others do. > - > -Moving the declaration of mayopen to the start of the function to avoid > -this problem. > - > -Resolves: #2435 > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - lib/fsm.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/lib/fsm.c b/lib/fsm.c > -index 5671ac642d..183293edb0 100644 > ---- a/lib/fsm.c > -+++ b/lib/fsm.c > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; > - int firstlinkfile = -1; > -+ int mayopen = 0; > - char *tid = NULL; > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > - struct filedata_s *firstlink = NULL; > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > - > - setmeta: > - /* Special files require path-based ops */ > -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > - if (!rc && fd == -1 && mayopen) { > - int flags = O_RDONLY; > - /* Only follow safe symlinks, and never on temporary files */ > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > similarity index 72% > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > index 3e85cbb8efe..af11dec5ef3 100644 > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > > -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > - file://fix-declaration.patch \ > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ > - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > - file://0001-Fix-missing-basename-include-on-macOS.patch \ > + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > " > > PE = "1" > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > > S = "${WORKDIR}/git" > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" > DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" > > -inherit autotools gettext pkgconfig python3native > -export PYTHON_ABI > - > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > - > -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > - > -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" > > # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs > # --localstatedir prevents rpm from writing its database to native sysroot when building images > -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset > -# plugins both behave badly inside builds. > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" > +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > + > +inherit cmake gettext pkgconfig python3targetconfig > +OECMAKE_GENERATOR = "Unix Makefiles" > > BBCLASSEXTEND = "native nativesdk" > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" > -# The inhibit plugin serves no purpose outside of the target > -PACKAGECONFIG:remove:class-native = "inhibit" > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > +PACKAGECONFIG ??= "internal-openpgp" > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" > -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > > -ASNEEDED = "" > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > + > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > > # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in > # libmagic also has sysroot path contamination, so override it > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > ${libdir}/rpm/rpmdeps \ > " > > -do_configure:prepend() { > - mkdir -p ${S}/build-aux > -} > - > do_install:append:class-native() { > for tool in ${WRAPPER_TOOLS}; do > test -x ${D}$tool && create_wrapper ${D}$tool \ > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > > do_install:append () { > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > ${D}/${libdir}/rpm/macros > > } > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > ${libdir}/rpm/check-* \ > ${libdir}/rpm/sepdebugcrcfix \ > ${libdir}/rpm/find-lang.sh \ > + ${libdir}/rpm/sysusers.sh \ > ${libdir}/rpm/*provides* \ > ${libdir}/rpm/*requires* \ > ${libdir}/rpm/*deps* \ > -- > 2.39.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#194368): https://lists.openembedded.org/g/openembedded-core/message/194368 > Mute This Topic: https://lists.openembedded.org/mt/103975822/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 2024-02-01 21:10 ` Alexandre Belloni @ 2024-02-01 21:19 ` Alexander Kanavin [not found] ` <17AFD9EAEAF14DA0.1968@lists.openembedded.org> 1 sibling, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-02-01 21:19 UTC (permalink / raw) To: Alexandre Belloni; +Cc: openembedded-core, Alexander Kanavin On the other hand, the difference seems to be down to %__urlhelpercmd·········usr/bin/curl %__urlhelpercmd·········/usr/bin/curl likely depending on whether curl is on the build host (and/or in sysroot) or not. I'll take a look. Alex On Thu, 1 Feb 2024 at 22:10, Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > You are going to love this one, rpm 4.19.1 is not reproducible: > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20240201-8dcic6ea/packages/diff-html/ > > On 26/01/2024 14:34:55+0100, Alexander Kanavin wrote: > > Upstream has replaced autoconf with cmake, which necessitates a rewrite of the > > recipe and available options, and a rebase to cmake of > > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : > > the patch was removing the NULL marker at the end of function arguments, > > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > was restoring it (in addition to the actual change the patch was making). > > Now both patches preserve the NULL terminator. > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > --- > > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > > ...satisfiable-dependency-when-building.patch | 12 +-- > > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > > ...-PATH-environment-variable-before-ru.patch | 12 +-- > > ...lename-before-passing-it-to-basename.patch | 40 ---------- > > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > > .../rpm/files/fix-declaration.patch | 39 ---------- > > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- > > 23 files changed, 328 insertions(+), 383 deletions(-) > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch > > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > index 9fa486dfd3c..96fe57dfeb8 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > @@ -1,4 +1,4 @@ > > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 > > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Thu, 9 Mar 2017 18:54:02 +0200 > > Subject: [PATCH] Add a color setting for mips64_n32 binaries > > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > 2 files changed, 6 insertions(+) > > > > diff --git a/build/rpmfc.c b/build/rpmfc.c > > -index 26606378f..a16e3f4e9 100644 > > +index 4b67a9bae..ed7e4e623 100644 > > --- a/build/rpmfc.c > > +++ b/build/rpmfc.c > > -@@ -646,6 +646,7 @@ exit: > > +@@ -660,6 +660,7 @@ exit: > > static const struct rpmfcTokens_s rpmfcTokens[] = { > > { "directory", RPMFC_INCLUDE }, > > > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > > > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > > color = RPMFC_ELF32; > > break; > > } > > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > > if (elf) > > elf_end(elf); > > diff --git a/rpmrc.in b/rpmrc.in > > -index 2975a3a0e..c7232b48b 100644 > > +index 8646a966b..7349fdfd3 100644 > > --- a/rpmrc.in > > +++ b/rpmrc.in > > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > > archcolor: mips64r6 2 > > archcolor: mips64r6el 2 > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > new file mode 100644 > > index 00000000000..5053caae33f > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > @@ -0,0 +1,28 @@ > > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than > > + cmake modules > > + > > +Otherwise cmake will try to find libm, badly, and fail. > > + > > +Upstream-Status: Inappropriate [oe-core specific] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > + > > +--- > > + CMakeLists.txt | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 7f0630453..d0ea565f3 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -187,7 +187,7 @@ set(REQFUNCS > > + ) > > + > > + find_package(PkgConfig REQUIRED) > > +-find_package(Lua 5.2 REQUIRED) > > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > > + find_package(ZLIB REQUIRED) > > + find_package(BZip2) > > + find_package(Iconv) > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > new file mode 100644 > > index 00000000000..db83b176b41 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > @@ -0,0 +1,42 @@ > > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > > +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit > > + option > > + > > +This was lost in autotools -> cmake transition. The particular > > +reason to make it explicit is that readline is gpl version 3 > > +licensed, and in some builds components under that license > > +need to be excluded. > > + > > +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > +--- > > + CMakeLists.txt | 7 ++++++- > > + 1 file changed, 6 insertions(+), 1 deletion(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 0a474106e..89e27417f 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) > > + option(WITH_FSVERITY "Build with fsverity support" OFF) > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > ++option(WITH_READLINE "Build with readline support" ON) > > + > > + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > +@@ -193,7 +194,11 @@ find_package(BZip2) > > + find_package(Iconv) > > + > > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > > ++ > > ++if (WITH_READLINE) > > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) > > ++endif() > > ++ > > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > index 8440c3516d6..df5543873c1 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > @@ -1,4 +1,4 @@ > > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 > > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Mon, 9 Jan 2017 18:52:11 +0200 > > Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in > > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > build/pack.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > -Index: git/build/pack.c > > -=================================================================== > > ---- git.orig/build/pack.c > > -+++ git/build/pack.c > > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > > +diff --git a/build/pack.c b/build/pack.c > > +index f7dac6d9a..f382c7da0 100644 > > +--- a/build/pack.c > > ++++ b/build/pack.c > > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch > > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); > > } > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > index 8fdc5edb10b..b056d19741a 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > @@ -1,4 +1,4 @@ > > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 > > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Mon, 27 Feb 2017 09:43:30 +0200 > > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for > > @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > --- > > - configure.ac | 2 +- > > - macros.in | 2 +- > > - rpm.am | 4 ++-- > > - 3 files changed, 4 insertions(+), 4 deletions(-) > > + CMakeLists.txt | 2 +- > > + macros.in | 2 +- > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > > -diff --git a/configure.ac b/configure.ac > > -index e6676c581..ec28db9b6 100644 > > ---- a/configure.ac > > -+++ b/configure.ac > > -@@ -942,7 +942,7 @@ else > > - usrprefix=$prefix > > - fi > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 2767915fb..7f0630453 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > > - AC_SUBST(RPMCONFIGDIR) > > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") > > ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > > - AC_SUBST(OBJDUMP) > > + # Emulate libtool versioning. Before a public release: > > diff --git a/macros.in b/macros.in > > -index a2411d784..735b74d99 100644 > > +index b49ffaad4..3acbe78f6 100644 > > --- a/macros.in > > +++ b/macros.in > > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ > > %_sharedstatedir %{_prefix}/com > > %_localstatedir %{_prefix}/var > > %_lib lib > > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > > %_includedir %{_prefix}/include > > %_infodir %{_datadir}/info > > %_mandir %{_datadir}/man > > -diff --git a/rpm.am b/rpm.am > > -index 55b5b3935..5a51f102b 100644 > > ---- a/rpm.am > > -+++ b/rpm.am > > -@@ -1,10 +1,10 @@ > > - # Internal binaries > > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm > > --rpmlibexecdir = $(prefix)/lib/rpm > > -+rpmlibexecdir = $(libdir)/rpm > > - > > - # Host independent config files > > - ## HACK: it probably should be $(datadir)/rpm > > --rpmconfigdir = $(prefix)/lib/rpm > > -+rpmconfigdir = $(libdir)/rpm > > - > > - # Libtool version (current-revision-age) for all our libraries > > - rpm_version_info = 13:0:4 > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > index fda64eefe01..6a18679da2f 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > @@ -1,35 +1,36 @@ > > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 > > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Tue, 10 Jan 2017 14:11:30 +0200 > > Subject: [PATCH] Do not read config files from $HOME > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmrc.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > -Index: git/lib/rpmrc.c > > -=================================================================== > > ---- git.orig/lib/rpmrc.c > > -+++ git/lib/rpmrc.c > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > +index 269d490ac..f39dcfc11 100644 > > +--- a/lib/rpmrc.c > > ++++ b/lib/rpmrc.c > > @@ -458,8 +458,7 @@ static void setDefaults(void) > > if (!defrcfiles) { > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > - SYSCONFDIR "/rpmrc", ":", > > - "~/.rpmrc", NULL); > > -+ SYSCONFDIR "/rpmrc", ":"); > > ++ SYSCONFDIR "/rpmrc", NULL); > > } > > > > #ifndef MACROFILES > > @@ -471,8 +470,7 @@ static void setDefaults(void) > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > + confdir, "/" RPM_VENDOR "/macros", ":", > > SYSCONFDIR "/rpm/macros.*", ":", > > SYSCONFDIR "/rpm/macros", ":", > > - SYSCONFDIR "/rpm/%{_target}/macros", ":", > > - "~/.rpmmacros", NULL); > > -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > } > > #else > > macrofiles = MACROFILES; > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > index ae24b663aae..318f65ed375 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > @@ -1,4 +1,4 @@ > > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 > > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Fri, 20 Jan 2017 13:32:06 +0200 > > Subject: [PATCH] Do not reset the PATH environment variable before running > > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > lib/rpmscript.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > -Index: git/lib/rpmscript.c > > -=================================================================== > > ---- git.orig/lib/rpmscript.c > > -+++ git/lib/rpmscript.c > > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > +index 36e37cf77..37ada014c 100644 > > +--- a/lib/rpmscript.c > > ++++ b/lib/rpmscript.c > > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, > > if (ipath && ipath[5] != '%') > > path = ipath; > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > deleted file mode 100644 > > index f9b809d1676..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 > > -From: Florian Festi <ffesti@redhat.com> > > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > > -Subject: [PATCH] Duplicate filename before passing it to basename > > - > > -basename is allowed change the string passed to it. While we don't need > > -the filename after that just casting away the const seems a bit too > > -hacky. > > - > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - tools/rpmuncompress.c | 4 +++- > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > - > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > -index 58ddf5683..e13cc6a66 100644 > > ---- a/tools/rpmuncompress.c > > -+++ b/tools/rpmuncompress.c > > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > > - if (needtar) { > > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); > > - } else if (at->compressed == COMPRESSED_GEM) { > > -- const char *bn = basename(fn); > > -+ char *tmp = xstrdup(fn); > > -+ const char *bn = basename(tmp); > > - size_t nvlen = strlen(bn) - 3; > > - char *gem = rpmGetPath("%{__gem}", NULL); > > - char *gemspec = NULL; > > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > > - > > - free(gemspec); > > - free(gem); > > -+ free(tmp); > > - } else { > > - rasprintf(&buf, "%s '%s'", zipper, fn); > > - } > > --- > > -2.43.0 > > - > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > deleted file mode 100644 > > index a93597a8352..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > +++ /dev/null > > @@ -1,26 +0,0 @@ > > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 > > -From: Calvin Buckley <calvin@cmpct.info> > > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > > -Subject: [PATCH] Fix missing basename include on macOS > > - > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - tools/rpmuncompress.c | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > -index bd4146d54..58ddf5683 100644 > > ---- a/tools/rpmuncompress.c > > -+++ b/tools/rpmuncompress.c > > -@@ -1,6 +1,7 @@ > > - #include "system.h" > > - > > - #include <popt.h> > > -+#include <libgen.h> > > - #include <errno.h> > > - #include <stdio.h> > > - #include <string.h> > > --- > > -2.43.0 > > - > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > new file mode 100644 > > index 00000000000..8e73e077049 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > @@ -0,0 +1,56 @@ > > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 > > +From: Panu Matilainen <pmatilai@redhat.com> > > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > > +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag > > + > > +This regressed when we axed our internal glob copy in commit > > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only > > +an optimization so we can just skip it if not available. > > + > > +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > +--- > > + CMakeLists.txt | 1 + > > + config.h.in | 1 + > > + rpmio/rpmglob.c | 2 ++ > > + 3 files changed, 4 insertions(+) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index d0ea565f3..0a474106e 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > > + set(HAVE_LIBDW 1) > > + endif() > > + > > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > > + if (NOT MAJOR_IN_SYSMACROS) > > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > > +diff --git a/config.h.in b/config.h.in > > +index cb97827d0..ab1757a9a 100644 > > +--- a/config.h.in > > ++++ b/config.h.in > > +@@ -100,6 +100,7 @@ > > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > > + #cmakedefine RUNDIR @rundir@ > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > +index 8276eddb4..243568766 100644 > > +--- a/rpmio/rpmglob.c > > ++++ b/rpmio/rpmglob.c > > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, > > + gflags |= GLOB_BRACE; > > + if (home != NULL && strlen(home) > 0) > > + gflags |= GLOB_TILDE; > > ++#if HAVE_GLOB_ONLYDIR > > + if (dir_only) > > + gflags |= GLOB_ONLYDIR; > > ++#endif > > + if (flags & RPMGLOB_NOCHECK) > > + gflags |= GLOB_NOCHECK; > > + > > diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > index bd3314a90f8..fc89b44132b 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > @@ -1,4 +1,4 @@ > > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 > > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Tue, 17 Jan 2017 14:07:17 +0200 > > Subject: [PATCH] When cross-installing, execute package scriptlets without > > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmscript.c | 11 ++++++++--- > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > -Index: git/lib/rpmscript.c > > -=================================================================== > > ---- git.orig/lib/rpmscript.c > > -+++ git/lib/rpmscript.c > > -@@ -18,7 +18,7 @@ > > - #include "rpmio/rpmio_internal.h" > > - > > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > > -- > > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > > - #include "debug.h" > > - > > - struct scriptNextFileFunc_s { > > -@@ -427,8 +427,7 @@ exit: > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > +index b18f851a3..36e37cf77 100644 > > +--- a/lib/rpmscript.c > > ++++ b/lib/rpmscript.c > > +@@ -448,8 +448,7 @@ exit: > > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > > > > if (fn) { > > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > > free(fn); > > } > > free(mline); > > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, > > > > if (rc != RPMRC_FAIL) { > > if (script_type & RPMSCRIPTLET_EXEC) { > > diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > index 64433abb6a1..5820b2e7e5b 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > @@ -1,4 +1,4 @@ > > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 > > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex@linutronix.de> > > Date: Tue, 31 Aug 2021 10:37:05 +0200 > > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata > > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > + > > --- > > build/pack.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > -Index: git/build/pack.c > > -=================================================================== > > ---- git.orig/build/pack.c > > -+++ git/build/pack.c > > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > > +diff --git a/build/pack.c b/build/pack.c > > +index f382c7da0..0889dd993 100644 > > +--- a/build/pack.c > > ++++ b/build/pack.c > > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); > > buf = xstrdup(rpmio_flags); > > buf[s - rpmio_flags] = '\0'; > > diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > deleted file mode 100644 > > index 29b6686a940..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > +++ /dev/null > > @@ -1,28 +0,0 @@ > > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 > > -From: Alexander Kanavin <alex@linutronix.de> > > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling > > - > > -x32 is a 64 bit x86 ABI with 32 bit pointers. > > - > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > ---- > > - configure.ac | 4 ++++ > > - 1 file changed, 4 insertions(+) > > - > > -Index: git/configure.ac > > -=================================================================== > > ---- git.orig/configure.ac > > -+++ git/configure.ac > > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > - host_os_gnu=-gnux32 > > - fi > > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > -+ host_os_gnu=-gnux32 > > -+fi > > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > > - fi > > diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > index 82e6567dc74..8b9f1f72944 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > @@ -1,4 +1,4 @@ > > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 > > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 > > From: Changqing Li <changqing.li@windriver.com> > > Date: Thu, 7 May 2020 17:40:58 +0800 > > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 > > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". > > Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> > > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > > + > > --- > > lib/transaction.c | 13 ++++++++++++- > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > -Index: git/lib/transaction.c > > -=================================================================== > > ---- git.orig/lib/transaction.c > > -+++ git/lib/transaction.c > > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > > +diff --git a/lib/transaction.c b/lib/transaction.c > > +index 70d2587ac..b89b30060 100644 > > +--- a/lib/transaction.c > > ++++ b/lib/transaction.c > > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > > rpmfsSetAction(ofs, ofx, FA_CREATE); > > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > > rConflicts = 0; > > diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > index a6c58699d36..388694d234f 100644 > > --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > @@ -1,4 +1,7 @@ > > -perl: disable auto requires > > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 > > +From: Mark Hatle <mark.hatle@windriver.com> > > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > > +Subject: [PATCH] perl: disable auto requires > > > > When generating automatic requirements, it's possible for perl scripts to > > declare 'optional' dependencies. These seem to often be incorrect and will > > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] > > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > > > -Index: git/fileattrs/perl.attr > > -=================================================================== > > ---- git.orig/fileattrs/perl.attr > > -+++ git/fileattrs/perl.attr > > +--- > > + fileattrs/perl.attr | 2 +- > > + fileattrs/perllib.attr | 2 +- > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > > +index 0daef58d5..81ddf5305 100644 > > +--- a/fileattrs/perl.attr > > ++++ b/fileattrs/perl.attr > > @@ -1,3 +1,3 @@ > > -%__perl_requires %{_rpmconfigdir}/perl.req > > +#__perl_requires %{_rpmconfigdir}/perl.req > > %__perl_magic ^.*[Pp]erl .*$ > > %__perl_flags exeonly > > -Index: git/fileattrs/perllib.attr > > -=================================================================== > > ---- git.orig/fileattrs/perllib.attr > > -+++ git/fileattrs/perllib.attr > > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > > +index fcad48099..495a28927 100644 > > +--- a/fileattrs/perllib.attr > > ++++ b/fileattrs/perllib.attr > > @@ -1,5 +1,5 @@ > > %__perllib_provides %{_rpmconfigdir}/perl.prov > > -%__perllib_requires %{_rpmconfigdir}/perl.req > > diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > deleted file mode 100644 > > index d0e637191a8..00000000000 > > --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > +++ /dev/null > > @@ -1,35 +0,0 @@ > > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 > > -From: Khem Raj <raj.khem@gmail.com> > > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash > > - > > -Fixes > > -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] > > -| hdr_hash, /* tp_hash */ > > -| ^~~~~~~~ > > - > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > ---- > > - python/header-py.c | 4 ++-- > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > - > > -diff --git a/python/header-py.c b/python/header-py.c > > -index 0aed0c9267..c15503f359 100644 > > ---- a/python/header-py.c > > -+++ b/python/header-py.c > > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) > > - "(Oi)", s, RPMTAG_NEVR); > > - } > > - > > --static long hdr_hash(PyObject * h) > > -+static Py_hash_t hdr_hash(PyObject * h) > > - { > > -- return (long) h; > > -+ return (Py_hash_t) h; > > - } > > - > > - static PyObject * hdr_reduce(hdrObject *s) > > --- > > -2.39.2 > > - > > diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > index 2fe96a839c3..89c23f81975 100644 > > --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > @@ -1,7 +1,7 @@ > > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 > > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Fri, 20 Jan 2017 13:33:05 +0200 > > -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > environment variable > > > > This is needed so that rpm can pick up target-specific configuration > > @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmrc.c | 19 ++++++++++++++----- > > 1 file changed, 14 insertions(+), 5 deletions(-) > > > > -Index: git/lib/rpmrc.c > > -=================================================================== > > ---- git.orig/lib/rpmrc.c > > -+++ git/lib/rpmrc.c > > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > +index f39dcfc11..f27f88753 100644 > > +--- a/lib/rpmrc.c > > ++++ b/lib/rpmrc.c > > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, > > static void setDefaults(void) > > { > > const char *confdir = rpmConfigDir(); > > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > > + > > if (!defrcfiles) { > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > -- SYSCONFDIR "/rpmrc", ":"); > > -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > +- SYSCONFDIR "/rpmrc", NULL); > > ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); > > } > > > > #ifndef MACROFILES > > @@ -468,9 +472,9 @@ static void setDefaults(void) > > confdir, "/platform/%{_target}/macros", ":", > > confdir, "/fileattrs/*.attr", ":", > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > + confdir, "/" RPM_VENDOR "/macros", ":", > > - SYSCONFDIR "/rpm/macros.*", ":", > > - SYSCONFDIR "/rpm/macros", ":", > > -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", > > + etcconfdir, SYSCONFDIR "/rpm/macros", ":", > > -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); > > ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > } > > #else > > macrofiles = MACROFILES; > > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > > */ > > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > { > > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > > static struct utsname un; > > char * chptr; > > canonEntry canon; > > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > > > if (arch) *arch = un.machine; > > if (os) *os = un.sysname; > > diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > new file mode 100644 > > index 00000000000..e7f0adc70c9 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > @@ -0,0 +1,26 @@ > > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html > > + > > +Building html would require doxygen-native. > > + > > +Upstream-Status: Inappropriate [oe-core specific] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > + > > +--- > > + docs/CMakeLists.txt | 1 - > > + 1 file changed, 1 deletion(-) > > + > > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > > +index 52dce7b4e..c01ff7757 100644 > > +--- a/docs/CMakeLists.txt > > ++++ b/docs/CMakeLists.txt > > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > > + endif() > > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) > > + > > + install(FILES > > + README.md > > diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > new file mode 100644 > > index 00000000000..3d4b09bedb6 > > --- /dev/null > > +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > @@ -0,0 +1,34 @@ > > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex@linutronix.de> > > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C > > + library > > + > > +This addresses musl failures; if there is code out there relying on > > +those braces, it needs to be fixed when used on musl. > > + > > +This is unlikely to be trivially fixable upstream. > > + > > +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > +--- > > + rpmio/rpmglob.c | 6 ++++++ > > + 1 file changed, 6 insertions(+) > > + > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > +index 243568766..43c27074a 100644 > > +--- a/rpmio/rpmglob.c > > ++++ b/rpmio/rpmglob.c > > +@@ -33,6 +33,12 @@ > > + > > + #include "debug.h" > > + > > ++/* Don't fail if the standard C library > > +++ * doesn't provide brace expansion */ > > ++#ifndef GLOB_BRACE > > ++#define GLOB_BRACE 0 > > ++#endif > > ++ > > + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ > > + static int ismagic(const char *pattern) > > + { > > diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > index 9dbe7125ded..b3d57cc8703 100644 > > --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > @@ -1,4 +1,4 @@ > > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 > > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > Date: Thu, 10 Jan 2019 18:14:18 +0100 > > Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO > > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > > > > Upstream-Status: Inappropriate [oe-core specific] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > + > > --- > > lib/rpmscript.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > -Index: git/lib/rpmscript.c > > -=================================================================== > > ---- git.orig/lib/rpmscript.c > > -+++ git/lib/rpmscript.c > > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > +index 37ada014c..bab0c97a6 100644 > > +--- a/lib/rpmscript.c > > ++++ b/lib/rpmscript.c > > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) > > if (Ferror(fd)) > > goto exit; > > > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > > static const char set_x[] = "set -x\n"; > > /* Assume failures will be caught by the write below */ > > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > char *mline = NULL; > > rpmRC rc = RPMRC_FAIL; > > > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > > > > if (script) { > > fn = writeScript(*argvp[0], script); > > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > sname, strerror(errno)); > > goto exit; > > } else if (pid == 0) {/* Child */ > > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > > sname, *argvp[0], (unsigned)getpid()); > > > > fclose(in); > > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > reaped = waitpid(pid, &status, 0); > > } while (reaped == -1 && errno == EINTR); > > > > diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > deleted file mode 100644 > > index 470dda1dcfb..00000000000 > > --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > +++ /dev/null > > @@ -1,51 +0,0 @@ > > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 > > -From: Panu Matilainen <pmatilai@redhat.com> > > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > > -Subject: [PATCH] Don't muck with per-process global sqlite configuration from > > - the db backend > > - > > -sqlite3_config() affects all in-process uses of sqlite. librpm being a > > -low-level library, it has no business whatsoever making such decisions > > -for the applications running on top of it. Besides that, the callback can > > -easily end up pointing to an already closed database, causing an > > -innocent API user to crash in librpm on an entirely unrelated error on > > -some other database. "Oops." > > - > > -The sqlite API doesn't seem to provide any per-db or non-global context > > -for logging errors, thus we can only remove the call and let sqlite output > > -errors the way it pleases (print through stderr, presumably). > > - > > -Thanks to Jan Palus for spotting and reporting! > > - > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] > > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > > ---- > > - lib/backend/sqlite.c | 8 -------- > > - 1 file changed, 8 deletions(-) > > - > > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > > -index 5a029d575a..b612732267 100644 > > ---- a/lib/backend/sqlite.c > > -+++ b/lib/backend/sqlite.c > > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) > > - sqlite3_result_int(sctx, match); > > - } > > - > > --static void errCb(void *data, int err, const char *msg) > > --{ > > -- rpmdb rdb = data; > > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > > -- rdb->db_descr, sqlite3_errstr(err), msg); > > --} > > -- > > - static int dbiCursorReset(dbiCursor dbc) > > - { > > - if (dbc->stmt) { > > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) > > - * the "database is locked" errors at every cost > > - */ > > - sqlite3_busy_timeout(sdb, 10000); > > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > > - > > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch > > deleted file mode 100644 > > index e5c84ebd498..00000000000 > > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > > +++ /dev/null > > @@ -1,39 +0,0 @@ > > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 > > -From: Florian Festi <ffesti@redhat.com> > > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > > -Subject: [PATCH] Fix compiler error on clang > > - > > -Turns out variable declarations are not allowed after a label, even in > > -C99. And while some compilers don't seem to care others do. > > - > > -Moving the declaration of mayopen to the start of the function to avoid > > -this problem. > > - > > -Resolves: #2435 > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > ---- > > - lib/fsm.c | 3 ++- > > - 1 file changed, 2 insertions(+), 1 deletion(-) > > - > > -diff --git a/lib/fsm.c b/lib/fsm.c > > -index 5671ac642d..183293edb0 100644 > > ---- a/lib/fsm.c > > -+++ b/lib/fsm.c > > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; > > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; > > - int firstlinkfile = -1; > > -+ int mayopen = 0; > > - char *tid = NULL; > > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > > - struct filedata_s *firstlink = NULL; > > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > - > > - setmeta: > > - /* Special files require path-based ops */ > > -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > - if (!rc && fd == -1 && mayopen) { > > - int flags = O_RDONLY; > > - /* Only follow safe symlinks, and never on temporary files */ > > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > similarity index 72% > > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > > index 3e85cbb8efe..af11dec5ef3 100644 > > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > > LICENSE = "GPL-2.0-only" > > LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > > > > -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > > +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > > @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > > - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > > - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > > - file://fix-declaration.patch \ > > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ > > - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > > - file://0001-Fix-missing-basename-include-on-macOS.patch \ > > + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > > + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > > + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > > + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > > + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > > " > > > > PE = "1" > > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > > > > S = "${WORKDIR}/git" > > > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" > > DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" > > > > -inherit autotools gettext pkgconfig python3native > > -export PYTHON_ABI > > - > > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > > - > > -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe > > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > > - > > -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages > > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" > > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" > > > > # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs > > # --localstatedir prevents rpm from writing its database to native sysroot when building images > > -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset > > -# plugins both behave badly inside builds. > > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" > > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" > > +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > > +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > > + > > +inherit cmake gettext pkgconfig python3targetconfig > > +OECMAKE_GENERATOR = "Unix Makefiles" > > > > BBCLASSEXTEND = "native nativesdk" > > > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" > > -# The inhibit plugin serves no purpose outside of the target > > -PACKAGECONFIG:remove:class-native = "inhibit" > > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > > +PACKAGECONFIG ??= "internal-openpgp" > > > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > > -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > > -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" > > -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > > -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" > > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > > +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > > > > -ASNEEDED = "" > > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > > +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > > + > > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > > +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > > +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > > +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > > > > # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in > > # libmagic also has sysroot path contamination, so override it > > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > > ${libdir}/rpm/rpmdeps \ > > " > > > > -do_configure:prepend() { > > - mkdir -p ${S}/build-aux > > -} > > - > > do_install:append:class-native() { > > for tool in ${WRAPPER_TOOLS}; do > > test -x ${D}$tool && create_wrapper ${D}$tool \ > > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > > > > do_install:append () { > > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > > ${D}/${libdir}/rpm/macros > > > > } > > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > > ${libdir}/rpm/check-* \ > > ${libdir}/rpm/sepdebugcrcfix \ > > ${libdir}/rpm/find-lang.sh \ > > + ${libdir}/rpm/sysusers.sh \ > > ${libdir}/rpm/*provides* \ > > ${libdir}/rpm/*requires* \ > > ${libdir}/rpm/*deps* \ > > -- > > 2.39.2 > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#194368): https://lists.openembedded.org/g/openembedded-core/message/194368 > > Mute This Topic: https://lists.openembedded.org/mt/103975822/3617179 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com ^ permalink raw reply [flat|nested] 20+ messages in thread
[parent not found: <17AFD9EAEAF14DA0.1968@lists.openembedded.org>]
* Re: [OE-core] [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 [not found] ` <17AFD9EAEAF14DA0.1968@lists.openembedded.org> @ 2024-02-02 12:27 ` Alexander Kanavin 0 siblings, 0 replies; 20+ messages in thread From: Alexander Kanavin @ 2024-02-02 12:27 UTC (permalink / raw) To: Alexandre Belloni; +Cc: openembedded-core, Alexander Kanavin I sent a patch for this. Alex On Thu, 1 Feb 2024 at 22:19, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > > On the other hand, the difference seems to be down to > > %__urlhelpercmd·········usr/bin/curl > %__urlhelpercmd·········/usr/bin/curl > > likely depending on whether curl is on the build host (and/or in > sysroot) or not. I'll take a look. > > Alex > > On Thu, 1 Feb 2024 at 22:10, Alexandre Belloni > <alexandre.belloni@bootlin.com> wrote: > > > > You are going to love this one, rpm 4.19.1 is not reproducible: > > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20240201-8dcic6ea/packages/diff-html/ > > > > On 26/01/2024 14:34:55+0100, Alexander Kanavin wrote: > > > Upstream has replaced autoconf with cmake, which necessitates a rewrite of the > > > recipe and available options, and a rebase to cmake of > > > 0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > > > > Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch : > > > the patch was removing the NULL marker at the end of function arguments, > > > and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > was restoring it (in addition to the actual change the patch was making). > > > Now both patches preserve the NULL terminator. > > > > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > --- > > > ...olor-setting-for-mips64_n32-binaries.patch | 12 +-- > > > ...ook-for-lua-with-pkg-config-rather-t.patch | 28 +++++++ > > > ...estore-readline-support-as-an-explic.patch | 42 +++++++++++ > > > ...satisfiable-dependency-when-building.patch | 12 +-- > > > ...lib-rpm-as-the-installation-path-for.patch | 52 +++++-------- > > > ...1-Do-not-read-config-files-from-HOME.patch | 19 ++--- > > > ...-PATH-environment-variable-before-ru.patch | 12 +-- > > > ...lename-before-passing-it-to-basename.patch | 40 ---------- > > > ...ix-missing-basename-include-on-macOS.patch | 26 ------- > > > ...l-dependency-on-non-POSIX-GLOB_ONLYD.patch | 56 ++++++++++++++ > > > ...lling-execute-package-scriptlets-wit.patch | 24 ++---- > > > ...not-insert-payloadflags-into-.rpm-me.patch | 13 ++-- > > > ...-linux-gnux32-variant-to-triplet-han.patch | 28 ------- > > > ....c-fix-file-conflicts-for-MIPS64-N32.patch | 13 ++-- > > > .../files/0001-perl-disable-auto-reqs.patch | 26 ++++--- > > > ...y_hash_t-instead-of-long-in-hdr_hash.patch | 35 --------- > > > ...prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | 31 ++++---- > > > ...txt-do-not-install-non-existent-docs.patch | 26 +++++++ > > > ...avoid-using-GLOB_BRACE-if-undefined-.patch | 34 +++++++++ > > > ...ge-logging-level-around-scriptlets-t.patch | 19 ++--- > > > ...87cfcf9cac87e5bc5e7db79b0338da9e355e.patch | 51 ------------- > > > .../rpm/files/fix-declaration.patch | 39 ---------- > > > .../rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} | 73 ++++++++----------- > > > 23 files changed, 328 insertions(+), 383 deletions(-) > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > create mode 100644 meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > delete mode 100644 meta/recipes-devtools/rpm/files/fix-declaration.patch > > > rename meta/recipes-devtools/rpm/{rpm_4.18.1.bb => rpm_4.19.1.bb} (72%) > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > index 9fa486dfd3c..96fe57dfeb8 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch > > > @@ -1,4 +1,4 @@ > > > -From 93f219df68f3741ff63a294a16bcbe8deba1112f Mon Sep 17 00:00:00 2001 > > > +From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Thu, 9 Mar 2017 18:54:02 +0200 > > > Subject: [PATCH] Add a color setting for mips64_n32 binaries > > > @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > 2 files changed, 6 insertions(+) > > > > > > diff --git a/build/rpmfc.c b/build/rpmfc.c > > > -index 26606378f..a16e3f4e9 100644 > > > +index 4b67a9bae..ed7e4e623 100644 > > > --- a/build/rpmfc.c > > > +++ b/build/rpmfc.c > > > -@@ -646,6 +646,7 @@ exit: > > > +@@ -660,6 +660,7 @@ exit: > > > static const struct rpmfcTokens_s rpmfcTokens[] = { > > > { "directory", RPMFC_INCLUDE }, > > > > > > @@ -23,7 +23,7 @@ index 26606378f..a16e3f4e9 100644 > > > { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, > > > { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, > > > > > > -@@ -1151,6 +1152,9 @@ static uint32_t getElfColor(const char *fn) > > > +@@ -1158,6 +1159,9 @@ static uint32_t getElfColor(const char *fn) > > > color = RPMFC_ELF32; > > > break; > > > } > > > @@ -34,10 +34,10 @@ index 26606378f..a16e3f4e9 100644 > > > if (elf) > > > elf_end(elf); > > > diff --git a/rpmrc.in b/rpmrc.in > > > -index 2975a3a0e..c7232b48b 100644 > > > +index 8646a966b..7349fdfd3 100644 > > > --- a/rpmrc.in > > > +++ b/rpmrc.in > > > -@@ -139,6 +139,8 @@ archcolor: mipsr6el 1 > > > +@@ -142,6 +142,8 @@ archcolor: mipsr6el 1 > > > archcolor: mips64r6 2 > > > archcolor: mips64r6el 2 > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > new file mode 100644 > > > index 00000000000..5053caae33f > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch > > > @@ -0,0 +1,28 @@ > > > +From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Wed, 29 Nov 2023 14:06:15 +0100 > > > +Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than > > > + cmake modules > > > + > > > +Otherwise cmake will try to find libm, badly, and fail. > > > + > > > +Upstream-Status: Inappropriate [oe-core specific] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > + > > > +--- > > > + CMakeLists.txt | 2 +- > > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > > + > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index 7f0630453..d0ea565f3 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -187,7 +187,7 @@ set(REQFUNCS > > > + ) > > > + > > > + find_package(PkgConfig REQUIRED) > > > +-find_package(Lua 5.2 REQUIRED) > > > ++pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) > > > + find_package(ZLIB REQUIRED) > > > + find_package(BZip2) > > > + find_package(Iconv) > > > diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > new file mode 100644 > > > index 00000000000..db83b176b41 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch > > > @@ -0,0 +1,42 @@ > > > +From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Tue, 16 Jan 2024 13:43:36 +0100 > > > +Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit > > > + option > > > + > > > +This was lost in autotools -> cmake transition. The particular > > > +reason to make it explicit is that readline is gpl version 3 > > > +licensed, and in some builds components under that license > > > +need to be excluded. > > > + > > > +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > +--- > > > + CMakeLists.txt | 7 ++++++- > > > + 1 file changed, 6 insertions(+), 1 deletion(-) > > > + > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index 0a474106e..89e27417f 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) > > > + option(WITH_FSVERITY "Build with fsverity support" OFF) > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > ++option(WITH_READLINE "Build with readline support" ON) > > > + > > > + set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > +@@ -193,7 +194,11 @@ find_package(BZip2) > > > + find_package(Iconv) > > > + > > > + pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) > > > +-pkg_check_modules(READLINE IMPORTED_TARGET readline) > > > ++ > > > ++if (WITH_READLINE) > > > ++ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) > > > ++endif() > > > ++ > > > + pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) > > > + pkg_check_modules(LIBELF IMPORTED_TARGET libelf) > > > + pkg_check_modules(LIBDW IMPORTED_TARGET libdw) > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > index 8440c3516d6..df5543873c1 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch > > > @@ -1,4 +1,4 @@ > > > -From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 > > > +From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Mon, 9 Jan 2017 18:52:11 +0200 > > > Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in > > > @@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > build/pack.c | 4 ---- > > > 1 file changed, 4 deletions(-) > > > > > > -Index: git/build/pack.c > > > -=================================================================== > > > ---- git.orig/build/pack.c > > > -+++ git/build/pack.c > > > -@@ -709,10 +709,6 @@ static rpmRC packageBinary(rpmSpec spec, > > > +diff --git a/build/pack.c b/build/pack.c > > > +index f7dac6d9a..f382c7da0 100644 > > > +--- a/build/pack.c > > > ++++ b/build/pack.c > > > +@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch > > > headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); > > > } > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > index 8fdc5edb10b..b056d19741a 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch > > > @@ -1,4 +1,4 @@ > > > -From 5fc560aaf1184d35d161f7d50dbb6323c90cc02d Mon Sep 17 00:00:00 2001 > > > +From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Mon, 27 Feb 2017 09:43:30 +0200 > > > Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for > > > @@ -8,29 +8,28 @@ Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263 > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > > > > --- > > > - configure.ac | 2 +- > > > - macros.in | 2 +- > > > - rpm.am | 4 ++-- > > > - 3 files changed, 4 insertions(+), 4 deletions(-) > > > + CMakeLists.txt | 2 +- > > > + macros.in | 2 +- > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > -diff --git a/configure.ac b/configure.ac > > > -index e6676c581..ec28db9b6 100644 > > > ---- a/configure.ac > > > -+++ b/configure.ac > > > -@@ -942,7 +942,7 @@ else > > > - usrprefix=$prefix > > > - fi > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index 2767915fb..7f0630453 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) > > > + option(WITH_IMAEVM "Build with IMA support" OFF) > > > + option(WITH_FAPOLICYD "Build with fapolicyd support" ON) > > > > > > --RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" > > > -+RPMCONFIGDIR="`echo ${libdir}/rpm`" > > > - AC_SUBST(RPMCONFIGDIR) > > > +-set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") > > > ++set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") > > > + set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") > > > > > > - AC_SUBST(OBJDUMP) > > > + # Emulate libtool versioning. Before a public release: > > > diff --git a/macros.in b/macros.in > > > -index a2411d784..735b74d99 100644 > > > +index b49ffaad4..3acbe78f6 100644 > > > --- a/macros.in > > > +++ b/macros.in > > > -@@ -930,7 +930,7 @@ package or when debugging this package.\ > > > +@@ -969,7 +969,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ > > > %_sharedstatedir %{_prefix}/com > > > %_localstatedir %{_prefix}/var > > > %_lib lib > > > @@ -39,20 +38,3 @@ index a2411d784..735b74d99 100644 > > > %_includedir %{_prefix}/include > > > %_infodir %{_datadir}/info > > > %_mandir %{_datadir}/man > > > -diff --git a/rpm.am b/rpm.am > > > -index 55b5b3935..5a51f102b 100644 > > > ---- a/rpm.am > > > -+++ b/rpm.am > > > -@@ -1,10 +1,10 @@ > > > - # Internal binaries > > > - ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm > > > --rpmlibexecdir = $(prefix)/lib/rpm > > > -+rpmlibexecdir = $(libdir)/rpm > > > - > > > - # Host independent config files > > > - ## HACK: it probably should be $(datadir)/rpm > > > --rpmconfigdir = $(prefix)/lib/rpm > > > -+rpmconfigdir = $(libdir)/rpm > > > - > > > - # Libtool version (current-revision-age) for all our libraries > > > - rpm_version_info = 13:0:4 > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > index fda64eefe01..6a18679da2f 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch > > > @@ -1,35 +1,36 @@ > > > -From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 > > > +From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Tue, 10 Jan 2017 14:11:30 +0200 > > > Subject: [PATCH] Do not read config files from $HOME > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmrc.c | 6 ++---- > > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > > > -Index: git/lib/rpmrc.c > > > -=================================================================== > > > ---- git.orig/lib/rpmrc.c > > > -+++ git/lib/rpmrc.c > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > > +index 269d490ac..f39dcfc11 100644 > > > +--- a/lib/rpmrc.c > > > ++++ b/lib/rpmrc.c > > > @@ -458,8 +458,7 @@ static void setDefaults(void) > > > if (!defrcfiles) { > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > > - SYSCONFDIR "/rpmrc", ":", > > > - "~/.rpmrc", NULL); > > > -+ SYSCONFDIR "/rpmrc", ":"); > > > ++ SYSCONFDIR "/rpmrc", NULL); > > > } > > > > > > #ifndef MACROFILES > > > @@ -471,8 +470,7 @@ static void setDefaults(void) > > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > > + confdir, "/" RPM_VENDOR "/macros", ":", > > > SYSCONFDIR "/rpm/macros.*", ":", > > > SYSCONFDIR "/rpm/macros", ":", > > > - SYSCONFDIR "/rpm/%{_target}/macros", ":", > > > - "~/.rpmmacros", NULL); > > > -+ SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > > ++ SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > > } > > > #else > > > macrofiles = MACROFILES; > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > index ae24b663aae..318f65ed375 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch > > > @@ -1,4 +1,4 @@ > > > -From a674b9cc7af448d7c6748bc163bf37dc14a57f09 Mon Sep 17 00:00:00 2001 > > > +From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Fri, 20 Jan 2017 13:32:06 +0200 > > > Subject: [PATCH] Do not reset the PATH environment variable before running > > > @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > lib/rpmscript.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > -Index: git/lib/rpmscript.c > > > -=================================================================== > > > ---- git.orig/lib/rpmscript.c > > > -+++ git/lib/rpmscript.c > > > -@@ -231,7 +231,7 @@ static void doScriptExec(ARGV_const_t ar > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > +index 36e37cf77..37ada014c 100644 > > > +--- a/lib/rpmscript.c > > > ++++ b/lib/rpmscript.c > > > +@@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, > > > if (ipath && ipath[5] != '%') > > > path = ipath; > > > > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch b/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > deleted file mode 100644 > > > index f9b809d1676..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-Duplicate-filename-before-passing-it-to-basename.patch > > > +++ /dev/null > > > @@ -1,40 +0,0 @@ > > > -From 3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1 Mon Sep 17 00:00:00 2001 > > > -From: Florian Festi <ffesti@redhat.com> > > > -Date: Wed, 26 Jul 2023 15:01:35 +0200 > > > -Subject: [PATCH] Duplicate filename before passing it to basename > > > - > > > -basename is allowed change the string passed to it. While we don't need > > > -the filename after that just casting away the const seems a bit too > > > -hacky. > > > - > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/3fa2ae78db9b31edb4c22f3b5cd36c6c972947f1] > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- > > > - tools/rpmuncompress.c | 4 +++- > > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > > - > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > > -index 58ddf5683..e13cc6a66 100644 > > > ---- a/tools/rpmuncompress.c > > > -+++ b/tools/rpmuncompress.c > > > -@@ -98,7 +98,8 @@ static char *doUntar(const char *fn) > > > - if (needtar) { > > > - rasprintf(&buf, "%s '%s' | %s %s -", zipper, fn, tar, taropts); > > > - } else if (at->compressed == COMPRESSED_GEM) { > > > -- const char *bn = basename(fn); > > > -+ char *tmp = xstrdup(fn); > > > -+ const char *bn = basename(tmp); > > > - size_t nvlen = strlen(bn) - 3; > > > - char *gem = rpmGetPath("%{__gem}", NULL); > > > - char *gemspec = NULL; > > > -@@ -112,6 +113,7 @@ static char *doUntar(const char *fn) > > > - > > > - free(gemspec); > > > - free(gem); > > > -+ free(tmp); > > > - } else { > > > - rasprintf(&buf, "%s '%s'", zipper, fn); > > > - } > > > --- > > > -2.43.0 > > > - > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch b/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > deleted file mode 100644 > > > index a93597a8352..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-Fix-missing-basename-include-on-macOS.patch > > > +++ /dev/null > > > @@ -1,26 +0,0 @@ > > > -From b2e67642fd8cb64d8cb1cca9e759396c1c10807d Mon Sep 17 00:00:00 2001 > > > -From: Calvin Buckley <calvin@cmpct.info> > > > -Date: Tue, 11 Jul 2023 19:22:41 -0300 > > > -Subject: [PATCH] Fix missing basename include on macOS > > > - > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b2e67642fd8cb64d8cb1cca9e759396c1c10807d] > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- > > > - tools/rpmuncompress.c | 1 + > > > - 1 file changed, 1 insertion(+) > > > - > > > -diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c > > > -index bd4146d54..58ddf5683 100644 > > > ---- a/tools/rpmuncompress.c > > > -+++ b/tools/rpmuncompress.c > > > -@@ -1,6 +1,7 @@ > > > - #include "system.h" > > > - > > > - #include <popt.h> > > > -+#include <libgen.h> > > > - #include <errno.h> > > > - #include <stdio.h> > > > - #include <string.h> > > > --- > > > -2.43.0 > > > - > > > diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > new file mode 100644 > > > index 00000000000..8e73e077049 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch > > > @@ -0,0 +1,56 @@ > > > +From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 > > > +From: Panu Matilainen <pmatilai@redhat.com> > > > +Date: Mon, 18 Dec 2023 12:25:04 +0200 > > > +Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag > > > + > > > +This regressed when we axed our internal glob copy in commit > > > +66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only > > > +an optimization so we can just skip it if not available. > > > + > > > +Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > +--- > > > + CMakeLists.txt | 1 + > > > + config.h.in | 1 + > > > + rpmio/rpmglob.c | 2 ++ > > > + 3 files changed, 4 insertions(+) > > > + > > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > > +index d0ea565f3..0a474106e 100644 > > > +--- a/CMakeLists.txt > > > ++++ b/CMakeLists.txt > > > +@@ -351,6 +351,7 @@ if (LIBDW_FOUND) > > > + set(HAVE_LIBDW 1) > > > + endif() > > > + > > > ++check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) > > > + check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) > > > + if (NOT MAJOR_IN_SYSMACROS) > > > + check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) > > > +diff --git a/config.h.in b/config.h.in > > > +index cb97827d0..ab1757a9a 100644 > > > +--- a/config.h.in > > > ++++ b/config.h.in > > > +@@ -100,6 +100,7 @@ > > > + #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ > > > + #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ > > > + #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ > > > ++#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ > > > + #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ > > > + #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ > > > + #cmakedefine RUNDIR @rundir@ > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > > +index 8276eddb4..243568766 100644 > > > +--- a/rpmio/rpmglob.c > > > ++++ b/rpmio/rpmglob.c > > > +@@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, > > > + gflags |= GLOB_BRACE; > > > + if (home != NULL && strlen(home) > 0) > > > + gflags |= GLOB_TILDE; > > > ++#if HAVE_GLOB_ONLYDIR > > > + if (dir_only) > > > + gflags |= GLOB_ONLYDIR; > > > ++#endif > > > + if (flags & RPMGLOB_NOCHECK) > > > + gflags |= GLOB_NOCHECK; > > > + > > > diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > index bd3314a90f8..fc89b44132b 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch > > > @@ -1,4 +1,4 @@ > > > -From a89daa75ac970d8e247edc762d1181e9a5b0c5d0 Mon Sep 17 00:00:00 2001 > > > +From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Tue, 17 Jan 2017 14:07:17 +0200 > > > Subject: [PATCH] When cross-installing, execute package scriptlets without > > > @@ -24,24 +24,16 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmscript.c | 11 ++++++++--- > > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > > > -Index: git/lib/rpmscript.c > > > -=================================================================== > > > ---- git.orig/lib/rpmscript.c > > > -+++ git/lib/rpmscript.c > > > -@@ -18,7 +18,7 @@ > > > - #include "rpmio/rpmio_internal.h" > > > - > > > - #include "lib/rpmplugins.h" /* rpm plugins hooks */ > > > -- > > > -+#include "lib/rpmchroot.h" /* rpmChrootOut */ > > > - #include "debug.h" > > > - > > > - struct scriptNextFileFunc_s { > > > -@@ -427,8 +427,7 @@ exit: > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > +index b18f851a3..36e37cf77 100644 > > > +--- a/lib/rpmscript.c > > > ++++ b/lib/rpmscript.c > > > +@@ -448,8 +448,7 @@ exit: > > > Fclose(out); /* XXX dup'd STDOUT_FILENO */ > > > > > > if (fn) { > > > @@ -51,7 +43,7 @@ Index: git/lib/rpmscript.c > > > free(fn); > > > } > > > free(mline); > > > -@@ -462,7 +461,13 @@ rpmRC rpmScriptRun(rpmScript script, int > > > +@@ -483,7 +482,13 @@ rpmRC rpmScriptRun(rpmScript script, int arg1, int arg2, FD_t scriptFd, > > > > > > if (rc != RPMRC_FAIL) { > > > if (script_type & RPMSCRIPTLET_EXEC) { > > > diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > index 64433abb6a1..5820b2e7e5b 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch > > > @@ -1,4 +1,4 @@ > > > -From 2d351c666f09cc1b9e368422653fb42ac8b86249 Mon Sep 17 00:00:00 2001 > > > +From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex@linutronix.de> > > > Date: Tue, 31 Aug 2021 10:37:05 +0200 > > > Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata > > > @@ -9,15 +9,16 @@ host to the next and breaks reproducibility for .rpm). > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > + > > > --- > > > build/pack.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > -Index: git/build/pack.c > > > -=================================================================== > > > ---- git.orig/build/pack.c > > > -+++ git/build/pack.c > > > -@@ -328,7 +328,7 @@ static char *getIOFlags(Package pkg) > > > +diff --git a/build/pack.c b/build/pack.c > > > +index f382c7da0..0889dd993 100644 > > > +--- a/build/pack.c > > > ++++ b/build/pack.c > > > +@@ -330,7 +330,7 @@ static char *getIOFlags(Package pkg) > > > headerPutString(pkg->header, RPMTAG_PAYLOADCOMPRESSOR, compr); > > > buf = xstrdup(rpmio_flags); > > > buf[s - rpmio_flags] = '\0'; > > > diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > deleted file mode 100644 > > > index 29b6686a940..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch > > > +++ /dev/null > > > @@ -1,28 +0,0 @@ > > > -From 8f51462d41d8fe942d5d0a06f08d47f625141995 Mon Sep 17 00:00:00 2001 > > > -From: Alexander Kanavin <alex@linutronix.de> > > > -Date: Thu, 4 Aug 2022 12:15:08 +0200 > > > -Subject: [PATCH] configure.ac: add linux-gnux32 variant to triplet handling > > > - > > > -x32 is a 64 bit x86 ABI with 32 bit pointers. > > > - > > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2143] > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > ---- > > > - configure.ac | 4 ++++ > > > - 1 file changed, 4 insertions(+) > > > - > > > -Index: git/configure.ac > > > -=================================================================== > > > ---- git.orig/configure.ac > > > -+++ git/configure.ac > > > -@@ -903,6 +903,10 @@ if echo "$host_os" | grep '.*-gnux32$' > > > > - host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > > - host_os_gnu=-gnux32 > > > - fi > > > -+if echo "$host_os" | grep '.*-gnux32$' > /dev/null ; then > > > -+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'` > > > -+ host_os_gnu=-gnux32 > > > -+fi > > > - if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then > > > - host_os=`echo "${host_os}" | sed 's/-gnu$//'` > > > - fi > > > diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > index 82e6567dc74..8b9f1f72944 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch > > > @@ -1,4 +1,4 @@ > > > -From 1ed066fc6fa7d7afffe3545c4e3ea937529e6c49 Mon Sep 17 00:00:00 2001 > > > +From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 > > > From: Changqing Li <changqing.li@windriver.com> > > > Date: Thu, 7 May 2020 17:40:58 +0800 > > > Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 > > > @@ -27,15 +27,16 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". > > > Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> > > > > > > Signed-off-by: Changqing Li <changqing.li@windriver.com> > > > + > > > --- > > > lib/transaction.c | 13 ++++++++++++- > > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > > > -Index: git/lib/transaction.c > > > -=================================================================== > > > ---- git.orig/lib/transaction.c > > > -+++ git/lib/transaction.c > > > -@@ -402,7 +402,18 @@ static int handleColorConflict(rpmts ts, > > > +diff --git a/lib/transaction.c b/lib/transaction.c > > > +index 70d2587ac..b89b30060 100644 > > > +--- a/lib/transaction.c > > > ++++ b/lib/transaction.c > > > +@@ -400,7 +400,18 @@ static int handleColorConflict(rpmts ts, > > > rpmfsSetAction(ofs, ofx, FA_CREATE); > > > rpmfsSetAction(fs, fx, FA_SKIPCOLOR); > > > rConflicts = 0; > > > diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > index a6c58699d36..388694d234f 100644 > > > --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch > > > @@ -1,4 +1,7 @@ > > > -perl: disable auto requires > > > +From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 > > > +From: Mark Hatle <mark.hatle@windriver.com> > > > +Date: Tue, 15 Aug 2017 16:41:57 -0500 > > > +Subject: [PATCH] perl: disable auto requires > > > > > > When generating automatic requirements, it's possible for perl scripts to > > > declare 'optional' dependencies. These seem to often be incorrect and will > > > @@ -10,19 +13,24 @@ Upstream-Status: Inappropriate [OE specific configuration] > > > > > > Signed-off-by: Mark Hatle <mark.hatle@windriver.com> > > > > > > -Index: git/fileattrs/perl.attr > > > -=================================================================== > > > ---- git.orig/fileattrs/perl.attr > > > -+++ git/fileattrs/perl.attr > > > +--- > > > + fileattrs/perl.attr | 2 +- > > > + fileattrs/perllib.attr | 2 +- > > > + 2 files changed, 2 insertions(+), 2 deletions(-) > > > + > > > +diff --git a/fileattrs/perl.attr b/fileattrs/perl.attr > > > +index 0daef58d5..81ddf5305 100644 > > > +--- a/fileattrs/perl.attr > > > ++++ b/fileattrs/perl.attr > > > @@ -1,3 +1,3 @@ > > > -%__perl_requires %{_rpmconfigdir}/perl.req > > > +#__perl_requires %{_rpmconfigdir}/perl.req > > > %__perl_magic ^.*[Pp]erl .*$ > > > %__perl_flags exeonly > > > -Index: git/fileattrs/perllib.attr > > > -=================================================================== > > > ---- git.orig/fileattrs/perllib.attr > > > -+++ git/fileattrs/perllib.attr > > > +diff --git a/fileattrs/perllib.attr b/fileattrs/perllib.attr > > > +index fcad48099..495a28927 100644 > > > +--- a/fileattrs/perllib.attr > > > ++++ b/fileattrs/perllib.attr > > > @@ -1,5 +1,5 @@ > > > %__perllib_provides %{_rpmconfigdir}/perl.prov > > > -%__perllib_requires %{_rpmconfigdir}/perl.req > > > diff --git a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch b/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > deleted file mode 100644 > > > index d0e637191a8..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch > > > +++ /dev/null > > > @@ -1,35 +0,0 @@ > > > -From 6ef189c45b763aedac5ef57ed6a5fc125fa95b41 Mon Sep 17 00:00:00 2001 > > > -From: Khem Raj <raj.khem@gmail.com> > > > -Date: Fri, 3 Mar 2023 09:54:48 -0800 > > > -Subject: [PATCH] python: Use Py_hash_t instead of long in hdr_hash > > > - > > > -Fixes > > > -python/header-py.c:744:2: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (PyObject *)' (aka 'long (struct _object *)') [-Wincompatible-function-pointer-types] > > > -| hdr_hash, /* tp_hash */ > > > -| ^~~~~~~~ > > > - > > > -Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2409] > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > > > ---- > > > - python/header-py.c | 4 ++-- > > > - 1 file changed, 2 insertions(+), 2 deletions(-) > > > - > > > -diff --git a/python/header-py.c b/python/header-py.c > > > -index 0aed0c9267..c15503f359 100644 > > > ---- a/python/header-py.c > > > -+++ b/python/header-py.c > > > -@@ -316,9 +316,9 @@ static PyObject * hdr_dsOfHeader(PyObject * s) > > > - "(Oi)", s, RPMTAG_NEVR); > > > - } > > > - > > > --static long hdr_hash(PyObject * h) > > > -+static Py_hash_t hdr_hash(PyObject * h) > > > - { > > > -- return (long) h; > > > -+ return (Py_hash_t) h; > > > - } > > > - > > > - static PyObject * hdr_reduce(hdrObject *s) > > > --- > > > -2.39.2 > > > - > > > diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > index 2fe96a839c3..89c23f81975 100644 > > > --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch > > > @@ -1,7 +1,7 @@ > > > -From 383c0b097b7eba16801a9e3c4b8e36a4b6de74ab Mon Sep 17 00:00:00 2001 > > > +From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Fri, 20 Jan 2017 13:33:05 +0200 > > > -Subject: [PATCH 2/2] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > > +Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR > > > environment variable > > > > > > This is needed so that rpm can pick up target-specific configuration > > > @@ -9,15 +9,16 @@ from target rootfs instead of its own native sysroot. > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmrc.c | 19 ++++++++++++++----- > > > 1 file changed, 14 insertions(+), 5 deletions(-) > > > > > > -Index: git/lib/rpmrc.c > > > -=================================================================== > > > ---- git.orig/lib/rpmrc.c > > > -+++ git/lib/rpmrc.c > > > -@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const > > > +diff --git a/lib/rpmrc.c b/lib/rpmrc.c > > > +index f39dcfc11..f27f88753 100644 > > > +--- a/lib/rpmrc.c > > > ++++ b/lib/rpmrc.c > > > +@@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, > > > static void setDefaults(void) > > > { > > > const char *confdir = rpmConfigDir(); > > > @@ -27,26 +28,26 @@ Index: git/lib/rpmrc.c > > > + > > > if (!defrcfiles) { > > > defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", > > > - confdir, "/" RPMCANONVENDOR "/rpmrc", ":", > > > -- SYSCONFDIR "/rpmrc", ":"); > > > -+ etcconfdir, SYSCONFDIR "/rpmrc", ":", NULL); > > > + confdir, "/" RPM_VENDOR "/rpmrc", ":", > > > +- SYSCONFDIR "/rpmrc", NULL); > > > ++ etcconfdir, SYSCONFDIR "/rpmrc", NULL); > > > } > > > > > > #ifndef MACROFILES > > > @@ -468,9 +472,9 @@ static void setDefaults(void) > > > confdir, "/platform/%{_target}/macros", ":", > > > confdir, "/fileattrs/*.attr", ":", > > > - confdir, "/" RPMCANONVENDOR "/macros", ":", > > > + confdir, "/" RPM_VENDOR "/macros", ":", > > > - SYSCONFDIR "/rpm/macros.*", ":", > > > - SYSCONFDIR "/rpm/macros", ":", > > > -- SYSCONFDIR "/rpm/%{_target}/macros", ":"); > > > +- SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > > + etcconfdir, SYSCONFDIR "/rpm/macros.*", ":", > > > + etcconfdir, SYSCONFDIR "/rpm/macros", ":", > > > -+ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", ":", NULL); > > > ++ etcconfdir, SYSCONFDIR "/rpm/%{_target}/macros", NULL); > > > } > > > #else > > > macrofiles = MACROFILES; > > > -@@ -997,7 +1001,11 @@ static void read_auxv(void) > > > +@@ -1114,7 +1118,11 @@ static void read_auxv(void) > > > */ > > > static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > > { > > > @@ -59,7 +60,7 @@ Index: git/lib/rpmrc.c > > > static struct utsname un; > > > char * chptr; > > > canonEntry canon; > > > -@@ -1307,6 +1315,7 @@ static void defaultMachine(rpmrcCtx ctx, > > > +@@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) > > > > > > if (arch) *arch = un.machine; > > > if (os) *os = un.sysname; > > > diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > new file mode 100644 > > > index 00000000000..e7f0adc70c9 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch > > > @@ -0,0 +1,26 @@ > > > +From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Wed, 29 Nov 2023 14:09:06 +0100 > > > +Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html > > > + > > > +Building html would require doxygen-native. > > > + > > > +Upstream-Status: Inappropriate [oe-core specific] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > + > > > +--- > > > + docs/CMakeLists.txt | 1 - > > > + 1 file changed, 1 deletion(-) > > > + > > > +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt > > > +index 52dce7b4e..c01ff7757 100644 > > > +--- a/docs/CMakeLists.txt > > > ++++ b/docs/CMakeLists.txt > > > +@@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) > > > + elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) > > > + set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) > > > + endif() > > > +-install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) > > > + > > > + install(FILES > > > + README.md > > > diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > new file mode 100644 > > > index 00000000000..3d4b09bedb6 > > > --- /dev/null > > > +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch > > > @@ -0,0 +1,34 @@ > > > +From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 > > > +From: Alexander Kanavin <alex@linutronix.de> > > > +Date: Tue, 16 Jan 2024 09:59:26 +0100 > > > +Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C > > > + library > > > + > > > +This addresses musl failures; if there is code out there relying on > > > +those braces, it needs to be fixed when used on musl. > > > + > > > +This is unlikely to be trivially fixable upstream. > > > + > > > +Upstream-Status: Inappropriate [reported at https://github.com/rpm-software-management/rpm/issues/2844] > > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > +--- > > > + rpmio/rpmglob.c | 6 ++++++ > > > + 1 file changed, 6 insertions(+) > > > + > > > +diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c > > > +index 243568766..43c27074a 100644 > > > +--- a/rpmio/rpmglob.c > > > ++++ b/rpmio/rpmglob.c > > > +@@ -33,6 +33,12 @@ > > > + > > > + #include "debug.h" > > > + > > > ++/* Don't fail if the standard C library > > > +++ * doesn't provide brace expansion */ > > > ++#ifndef GLOB_BRACE > > > ++#define GLOB_BRACE 0 > > > ++#endif > > > ++ > > > + /* Return 1 if pattern contains a magic char, see glob(7) for a list */ > > > + static int ismagic(const char *pattern) > > > + { > > > diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > index 9dbe7125ded..b3d57cc8703 100644 > > > --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch > > > @@ -1,4 +1,4 @@ > > > -From 989e425d416474c191b020d0825895e3df4bd033 Mon Sep 17 00:00:00 2001 > > > +From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 > > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > Date: Thu, 10 Jan 2019 18:14:18 +0100 > > > Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO > > > @@ -9,15 +9,16 @@ irrelevant noise to rootfs logs. > > > > > > Upstream-Status: Inappropriate [oe-core specific] > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > > + > > > --- > > > lib/rpmscript.c | 8 ++++---- > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > -Index: git/lib/rpmscript.c > > > -=================================================================== > > > ---- git.orig/lib/rpmscript.c > > > -+++ git/lib/rpmscript.c > > > -@@ -270,7 +270,7 @@ static char * writeScript(const char *cm > > > +diff --git a/lib/rpmscript.c b/lib/rpmscript.c > > > +index 37ada014c..bab0c97a6 100644 > > > +--- a/lib/rpmscript.c > > > ++++ b/lib/rpmscript.c > > > +@@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) > > > if (Ferror(fd)) > > > goto exit; > > > > > > @@ -26,7 +27,7 @@ Index: git/lib/rpmscript.c > > > static const char set_x[] = "set -x\n"; > > > /* Assume failures will be caught by the write below */ > > > Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); > > > -@@ -302,7 +302,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > +@@ -323,7 +323,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > > char *mline = NULL; > > > rpmRC rc = RPMRC_FAIL; > > > > > > @@ -35,7 +36,7 @@ Index: git/lib/rpmscript.c > > > > > > if (script) { > > > fn = writeScript(*argvp[0], script); > > > -@@ -354,7 +354,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > +@@ -375,7 +375,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > > sname, strerror(errno)); > > > goto exit; > > > } else if (pid == 0) {/* Child */ > > > @@ -44,7 +45,7 @@ Index: git/lib/rpmscript.c > > > sname, *argvp[0], (unsigned)getpid()); > > > > > > fclose(in); > > > -@@ -397,7 +397,7 @@ static rpmRC runExtScript(rpmPlugins plu > > > +@@ -418,7 +418,7 @@ static rpmRC runExtScript(rpmPlugins plugins, ARGV_const_t prefixes, > > > reaped = waitpid(pid, &status, 0); > > > } while (reaped == -1 && errno == EINTR); > > > > > > diff --git a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch b/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > deleted file mode 100644 > > > index 470dda1dcfb..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch > > > +++ /dev/null > > > @@ -1,51 +0,0 @@ > > > -From ea3187cfcf9cac87e5bc5e7db79b0338da9e355e Mon Sep 17 00:00:00 2001 > > > -From: Panu Matilainen <pmatilai@redhat.com> > > > -Date: Mon, 26 Jun 2023 12:45:09 +0300 > > > -Subject: [PATCH] Don't muck with per-process global sqlite configuration from > > > - the db backend > > > - > > > -sqlite3_config() affects all in-process uses of sqlite. librpm being a > > > -low-level library, it has no business whatsoever making such decisions > > > -for the applications running on top of it. Besides that, the callback can > > > -easily end up pointing to an already closed database, causing an > > > -innocent API user to crash in librpm on an entirely unrelated error on > > > -some other database. "Oops." > > > - > > > -The sqlite API doesn't seem to provide any per-db or non-global context > > > -for logging errors, thus we can only remove the call and let sqlite output > > > -errors the way it pleases (print through stderr, presumably). > > > - > > > -Thanks to Jan Palus for spotting and reporting! > > > - > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e] > > > -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > > > ---- > > > - lib/backend/sqlite.c | 8 -------- > > > - 1 file changed, 8 deletions(-) > > > - > > > -diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c > > > -index 5a029d575a..b612732267 100644 > > > ---- a/lib/backend/sqlite.c > > > -+++ b/lib/backend/sqlite.c > > > -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc, sqlite3_value **argv) > > > - sqlite3_result_int(sctx, match); > > > - } > > > - > > > --static void errCb(void *data, int err, const char *msg) > > > --{ > > > -- rpmdb rdb = data; > > > -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", > > > -- rdb->db_descr, sqlite3_errstr(err), msg); > > > --} > > > -- > > > - static int dbiCursorReset(dbiCursor dbc) > > > - { > > > - if (dbc->stmt) { > > > -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) > > > - * the "database is locked" errors at every cost > > > - */ > > > - sqlite3_busy_timeout(sdb, 10000); > > > -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); > > > - > > > - sqlexec(sdb, "PRAGMA secure_delete = OFF"); > > > - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); > > > diff --git a/meta/recipes-devtools/rpm/files/fix-declaration.patch b/meta/recipes-devtools/rpm/files/fix-declaration.patch > > > deleted file mode 100644 > > > index e5c84ebd498..00000000000 > > > --- a/meta/recipes-devtools/rpm/files/fix-declaration.patch > > > +++ /dev/null > > > @@ -1,39 +0,0 @@ > > > -From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 > > > -From: Florian Festi <ffesti@redhat.com> > > > -Date: Thu, 16 Mar 2023 19:05:04 +0100 > > > -Subject: [PATCH] Fix compiler error on clang > > > - > > > -Turns out variable declarations are not allowed after a label, even in > > > -C99. And while some compilers don't seem to care others do. > > > - > > > -Moving the declaration of mayopen to the start of the function to avoid > > > -this problem. > > > - > > > -Resolves: #2435 > > > -Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414] > > > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > > > ---- > > > - lib/fsm.c | 3 ++- > > > - 1 file changed, 2 insertions(+), 1 deletion(-) > > > - > > > -diff --git a/lib/fsm.c b/lib/fsm.c > > > -index 5671ac642d..183293edb0 100644 > > > ---- a/lib/fsm.c > > > -+++ b/lib/fsm.c > > > -@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > > - int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; > > > - int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; > > > - int firstlinkfile = -1; > > > -+ int mayopen = 0; > > > - char *tid = NULL; > > > - struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); > > > - struct filedata_s *firstlink = NULL; > > > -@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, > > > - > > > - setmeta: > > > - /* Special files require path-based ops */ > > > -- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > > -+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); > > > - if (!rc && fd == -1 && mayopen) { > > > - int flags = O_RDONLY; > > > - /* Only follow safe symlinks, and never on temporary files */ > > > diff --git a/meta/recipes-devtools/rpm/rpm_4.18.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > similarity index 72% > > > rename from meta/recipes-devtools/rpm/rpm_4.18.1.bb > > > rename to meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > index 3e85cbb8efe..af11dec5ef3 100644 > > > --- a/meta/recipes-devtools/rpm/rpm_4.18.1.bb > > > +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.bb > > > @@ -24,7 +24,7 @@ HOMEPAGE = "http://www.rpm.org" > > > LICENSE = "GPL-2.0-only" > > > LIC_FILES_CHKSUM = "file://COPYING;md5=c4eec0c20c6034b9407a09945b48a43f" > > > > > > -SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protocol=https \ > > > +SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.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 \ > > > @@ -36,58 +36,51 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.18.x;protoc > > > file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ > > > file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ > > > file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ > > > - file://0001-configure.ac-add-linux-gnux32-variant-to-triplet-han.patch \ > > > - file://0001-python-Use-Py_hash_t-instead-of-long-in-hdr_hash.patch \ > > > - file://fix-declaration.patch \ > > > - file://ea3187cfcf9cac87e5bc5e7db79b0338da9e355e.patch \ > > > - file://0001-Duplicate-filename-before-passing-it-to-basename.patch \ > > > - file://0001-Fix-missing-basename-include-on-macOS.patch \ > > > + file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ > > > + file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ > > > + file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ > > > + file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ > > > + file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ > > > " > > > > > > PE = "1" > > > -SRCREV = "4588bc3f994338502d2770ad24cbfcdaa6c335ec" > > > +SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" > > > > > > S = "${WORKDIR}/git" > > > > > > -DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3" > > > +DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd" > > > DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native" > > > > > > -inherit autotools gettext pkgconfig python3native > > > -export PYTHON_ABI > > > - > > > -AUTOTOOLS_AUXDIR = "${S}/build-aux" > > > - > > > -# OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe > > > -EXTRA_AUTORECONF:append = " --exclude=gnu-configize" > > > - > > > -# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages > > > -EXTRA_OECONF:append = " --enable-python --with-crypto=libgcrypt --with-vendor=pc" > > > -EXTRA_OECONF:append:libc-musl = " --disable-nls --disable-openmp" > > > +EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF" > > > > > > # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs > > > # --localstatedir prevents rpm from writing its database to native sysroot when building images > > > -# Forcibly disable plugins for native/nativesdk, as the inhibit and prioreset > > > -# plugins both behave badly inside builds. > > > -EXTRA_OECONF:append:class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" > > > -EXTRA_OECONF:append:class-nativesdk = " --sysconfdir=/etc --disable-plugins" > > > +EXTRA_OECMAKE:append:class-native = " -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var" > > > +EXTRA_OECMAKE:append:class-nativesdk = " -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc" > > > + > > > +inherit cmake gettext pkgconfig python3targetconfig > > > +OECMAKE_GENERATOR = "Unix Makefiles" > > > > > > BBCLASSEXTEND = "native nativesdk" > > > > > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'inhibit', '', d)} sqlite zstd" > > > -# The inhibit plugin serves no purpose outside of the target > > > -PACKAGECONFIG:remove:class-native = "inhibit" > > > -PACKAGECONFIG:remove:class-nativesdk = "inhibit" > > > +PACKAGECONFIG ??= "internal-openpgp" > > > > > > -PACKAGECONFIG[imaevm] = "--with-imaevm,,ima-evm-utils" > > > -PACKAGECONFIG[inhibit] = "--enable-inhibit-plugin,--disable-inhibit-plugin,dbus" > > > -PACKAGECONFIG[rpm2archive] = "--with-archive,--without-archive,libarchive" > > > -PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" > > > -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" > > > -PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" > > > -PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" > > > -PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" > > > +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" > > > +PACKAGECONFIG[testsuite] = "-DENABLE_TESTSUITE=ON,-DENABLE_TESTSUITE=OFF" > > > > > > -ASNEEDED = "" > > > +# Deprecated! https://fedoraproject.org/wiki/Changes/RpmSequoia > > > +PACKAGECONFIG[internal-openpgp] = "-DWITH_INTERNAL_OPENPGP=ON,-DWITH_INTERNAL_OPENPGP=OFF" > > > + > > > +PACKAGECONFIG[cap] = "-DWITH_CAP=ON,-DWITH_CAP=OFF" > > > +PACKAGECONFIG[acl] = "-DWITH_ACL=ON,-DWITH_ACL=OFF" > > > +PACKAGECONFIG[archive] = "-DWITH_ARCHIVE=ON,-DWITH_ARCHIVE=OFF,libarchive" > > > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF" > > > +PACKAGECONFIG[dbus] = "-DWITH_DBUS=ON,-DWITH_DBUS=OFF" > > > +PACKAGECONFIG[audit] = "-DWITH_AUDIT=ON,-DWITH_AUDIT=OFF" > > > +PACKAGECONFIG[fsverity] = "-DWITH_FSVERITY=ON,-DWITH_FSVERITY=OFF" > > > +PACKAGECONFIG[imaevm] = "-DWITH_IMAEVM=ON,-DWITH_IMAEVM=OFF" > > > +PACKAGECONFIG[fapolicyd] = "-DWITH_FAPOLICYD=ON,-DWITH_FAPOLICYD=OFF" > > > +PACKAGECONFIG[readline] = "-DWITH_READLINE=ON,-DWITH_READLINE=OFF,readline" > > > > > > # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in > > > # libmagic also has sysroot path contamination, so override it > > > @@ -105,10 +98,6 @@ WRAPPER_TOOLS = " \ > > > ${libdir}/rpm/rpmdeps \ > > > " > > > > > > -do_configure:prepend() { > > > - mkdir -p ${S}/build-aux > > > -} > > > - > > > do_install:append:class-native() { > > > for tool in ${WRAPPER_TOOLS}; do > > > test -x ${D}$tool && create_wrapper ${D}$tool \ > > > @@ -143,6 +132,7 @@ do_install:append:class-nativesdk() { > > > > > > do_install:append () { > > > sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ > > > + -e 's:${STAGING_DIR_NATIVE}/::g' \ > > > ${D}/${libdir}/rpm/macros > > > > > > } > > > @@ -166,6 +156,7 @@ FILES:${PN}-build = "\ > > > ${libdir}/rpm/check-* \ > > > ${libdir}/rpm/sepdebugcrcfix \ > > > ${libdir}/rpm/find-lang.sh \ > > > + ${libdir}/rpm/sysusers.sh \ > > > ${libdir}/rpm/*provides* \ > > > ${libdir}/rpm/*requires* \ > > > ${libdir}/rpm/*deps* \ > > > -- > > > 2.39.2 > > > > > > > > > > > > > > > > > > > > -- > > Alexandre Belloni, co-owner and COO, Bootlin > > Embedded Linux and Kernel engineering > > https://bootlin.com > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#194755): https://lists.openembedded.org/g/openembedded-core/message/194755 > Mute This Topic: https://lists.openembedded.org/mt/103975822/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2024-02-02 12:28 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-26 13:34 [PATCH 1/8] sysroot user management postinsts: run with /bin/sh -e to report errors when they happen Alexander Kanavin
2024-01-26 13:34 ` [PATCH 2/8] classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS Alexander Kanavin
2024-01-26 13:34 ` [PATCH 3/8] classes/staging: capture output of sysroot postinsts into logs Alexander Kanavin
2024-01-26 13:34 ` [PATCH 4/8] classes/package_rpm: write file permissions and ownership explicitly into .spec Alexander Kanavin
2024-01-26 13:34 ` [PATCH 5/8] classes/package_rpm: use weak user/group dependencies Alexander Kanavin
2024-01-26 13:34 ` [PATCH 6/8] classes/package_rpm: set bogus locations for passwd/group files Alexander Kanavin
2024-01-26 13:34 ` [PATCH 7/8] oeqa/runtime/rpm: fail tests if test rpm file cannot be found Alexander Kanavin
2024-01-26 14:11 ` [OE-core] " Richard Purdie
2024-01-26 14:21 ` Alexander Kanavin
2024-01-26 13:34 ` [PATCH 8/8] rpm: update 4.18.1 -> 4.19.1 Alexander Kanavin
2024-01-28 16:53 ` [OE-core] " Khem Raj
2024-01-28 19:04 ` Alexander Kanavin
[not found] ` <17AE983A55179990.23935@lists.openembedded.org>
2024-01-29 11:57 ` Alexander Kanavin
2024-01-29 12:11 ` Matt Madison
2024-01-29 12:22 ` Alexander Kanavin
2024-01-29 16:30 ` Matt Madison
2024-01-29 16:44 ` Mark Hatle
2024-02-01 21:10 ` Alexandre Belloni
2024-02-01 21:19 ` Alexander Kanavin
[not found] ` <17AFD9EAEAF14DA0.1968@lists.openembedded.org>
2024-02-02 12:27 ` Alexander Kanavin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox