diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-03-16 15:19:07 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:53:04 +0000 |
commit | aa66e8782ed9b869480e4a1aac12923dfee10368 (patch) | |
tree | 0cd0175b6b3e6ddef847f42ec69b07baa7eea054 /meta/lib | |
parent | fd04d165684963b066333e1ac442e92584a534b7 (diff) | |
download | poky-aa66e8782ed9b869480e4a1aac12923dfee10368.tar.gz |
dnf: add /usr/bin/dnf symlink that points to /usr/bin/dnf-2
All documentation refers to dnf binary as 'dnf' yet make install
does not create one - it's done by Fedora's spec file when building
the rpm. Let's replicate this behavior.
(From OE-Core rev: 456c4a8ffc9a292d7a3e036d92baf4a8f14d1f45)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/package_manager.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/cases/dnf.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index eeb4c76071..ae6849bce3 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -677,7 +677,7 @@ class RpmPM(PackageManager): | |||
677 | def _invoke_dnf(self, dnf_args, fatal = True, print_output = True ): | 677 | def _invoke_dnf(self, dnf_args, fatal = True, print_output = True ): |
678 | os.environ['RPM_ETCCONFIGDIR'] = self.target_rootfs | 678 | os.environ['RPM_ETCCONFIGDIR'] = self.target_rootfs |
679 | 679 | ||
680 | dnf_cmd = bb.utils.which(os.getenv('PATH'), "dnf-2") | 680 | dnf_cmd = bb.utils.which(os.getenv('PATH'), "dnf") |
681 | standard_dnf_args = (["-v", "--rpmverbosity=debug"] if self.d.getVar('ROOTFS_RPM_DEBUG') else []) + ["-y", | 681 | standard_dnf_args = (["-v", "--rpmverbosity=debug"] if self.d.getVar('ROOTFS_RPM_DEBUG') else []) + ["-y", |
682 | "-c", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), | 682 | "-c", oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), |
683 | "--setopt=reposdir=%s" %(oe.path.join(self.target_rootfs, "etc/yum.repos.d")), | 683 | "--setopt=reposdir=%s" %(oe.path.join(self.target_rootfs, "etc/yum.repos.d")), |
diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py index 77e7eb9450..59a263dc63 100644 --- a/meta/lib/oeqa/runtime/cases/dnf.py +++ b/meta/lib/oeqa/runtime/cases/dnf.py | |||
@@ -12,7 +12,7 @@ from oeqa.runtime.decorator.package import OEHasPackage | |||
12 | class DnfTest(OERuntimeTestCase): | 12 | class DnfTest(OERuntimeTestCase): |
13 | 13 | ||
14 | def dnf(self, command, expected = 0): | 14 | def dnf(self, command, expected = 0): |
15 | command = 'dnf-2 %s' % command | 15 | command = 'dnf %s' % command |
16 | status, output = self.target.run(command, 1500) | 16 | status, output = self.target.run(command, 1500) |
17 | message = os.linesep.join([command, output]) | 17 | message = os.linesep.join([command, output]) |
18 | self.assertEqual(status, expected, message) | 18 | self.assertEqual(status, expected, message) |