diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/package_manager/rpm/__init__.py | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf_4.16.1.bb (renamed from meta/recipes-devtools/dnf/dnf_4.14.0.bb) | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py index fa218485f5..f40c880af4 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): | |||
386 | self.save_rpmpostinst(pkg) | 386 | self.save_rpmpostinst(pkg) |
387 | 387 | ||
388 | def extract(self, pkg): | 388 | def extract(self, pkg): |
389 | output = self._invoke_dnf(["repoquery", "--queryformat", "%{location}", pkg]) | 389 | output = self._invoke_dnf(["repoquery", "--location", pkg]) |
390 | pkg_name = output.splitlines()[-1] | 390 | pkg_name = output.splitlines()[-1] |
391 | if not pkg_name.endswith(".rpm"): | 391 | if not pkg_name.endswith(".rpm"): |
392 | bb.fatal("dnf could not find package %s in repository: %s" %(pkg, output)) | 392 | bb.fatal("dnf could not find package %s in repository: %s" %(pkg, output)) |
393 | pkg_path = oe.path.join(self.rpm_repo_dir, pkg_name) | 393 | # Strip file: prefix |
394 | pkg_path = pkg_name[5:] | ||
394 | 395 | ||
395 | cpio_cmd = bb.utils.which(os.getenv("PATH"), "cpio") | 396 | cpio_cmd = bb.utils.which(os.getenv("PATH"), "cpio") |
396 | rpm2cpio_cmd = bb.utils.which(os.getenv("PATH"), "rpm2cpio") | 397 | 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 index 62df8c4ace..ff79701dc7 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 | |||
18 | file://0001-dnf-write-the-log-lock-to-root.patch \ | 18 | file://0001-dnf-write-the-log-lock-to-root.patch \ |
19 | " | 19 | " |
20 | 20 | ||
21 | SRCREV = "e50875b3f5790f70720bdb670e1dd2bf4d828744" | 21 | SRCREV = "94b7cc7956580405b219329541d6b40db6499cf1" |
22 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 22 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
23 | 23 | ||
24 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |