dnf: upgrade 4.14.0 -> 4.16.1

Correct the query for locations of rpm package files in the local repo:
upstream has changed it to a separate cmdline parameter.

(From OE-Core rev: 41bf007d80bae05921bf3e2dd65600f64133041f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-06-14 11:28:39 +02:00
committed by Richard Purdie
parent 76b7834c1f
commit 7ef4600549
2 changed files with 4 additions and 3 deletions

View File

@@ -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")

View File

@@ -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"