Correct the query for locations of rpm package files in the local repo: upstream has changed it to a separate cmdline parameter.
Signed-off-by: Alexander Kanavin <[email protected]> --- meta/lib/oe/package_manager/rpm/__init__.py | 5 +++-- meta/recipes-devtools/dnf/{dnf_4.14.0.bb => dnf_4.16.1.bb} | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename meta/recipes-devtools/dnf/{dnf_4.14.0.bb => dnf_4.16.1.bb} (98%) diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py index fa218485f5e..f40c880af49 100644 --- a/meta/lib/oe/package_manager/rpm/__init__.py +++ b/meta/lib/oe/package_manager/rpm/__init__.py @@ -386,11 +386,12 @@ class RpmPM(PackageManager): self.save_rpmpostinst(pkg) def extract(self, pkg): - output = self._invoke_dnf(["repoquery", "--queryformat", "%{location}", pkg]) + output = self._invoke_dnf(["repoquery", "--location", pkg]) pkg_name = output.splitlines()[-1] if not pkg_name.endswith(".rpm"): bb.fatal("dnf could not find package %s in repository: %s" %(pkg, output)) - pkg_path = oe.path.join(self.rpm_repo_dir, pkg_name) + # Strip file: prefix + pkg_path = pkg_name[5:] cpio_cmd = bb.utils.which(os.getenv("PATH"), "cpio") rpm2cpio_cmd = bb.utils.which(os.getenv("PATH"), "rpm2cpio") diff --git a/meta/recipes-devtools/dnf/dnf_4.14.0.bb b/meta/recipes-devtools/dnf/dnf_4.16.1.bb similarity index 98% rename from meta/recipes-devtools/dnf/dnf_4.14.0.bb rename to meta/recipes-devtools/dnf/dnf_4.16.1.bb index 62df8c4ace5..ff79701dc7b 100644 --- a/meta/recipes-devtools/dnf/dnf_4.14.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.16.1.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc file://0001-dnf-write-the-log-lock-to-root.patch \ " -SRCREV = "e50875b3f5790f70720bdb670e1dd2bf4d828744" +SRCREV = "94b7cc7956580405b219329541d6b40db6499cf1" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182761): https://lists.openembedded.org/g/openembedded-core/message/182761 Mute This Topic: https://lists.openembedded.org/mt/99524152/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
