From 789e3fc225adbb61f10aaa3bbc3677856f5f0238 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 21 Jun 2017 15:58:21 +0300 Subject: package_manager.py: set dnf's releasever setting from DISTRO_CODENAME So that: 1) dnf does not complain anymore about releasever not being set and then fail for the same reason; 2) it's possible to refer to $releasever in dnf package feed configuration (repo paths in particular) without hardconding the release name (pyro, morty, etc.) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/lib/oe/package_manager.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/lib/oe/package_manager.py') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index bc4e3013f0..72503eb9d3 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -494,9 +494,11 @@ class RpmPM(PackageManager): # This prevents accidental matching against libsolv's built-in policies if len(archs) <= 1: archs = archs + ["bogusarch"] - archconfdir = "%s/%s" %(self.target_rootfs, "etc/dnf/vars/") - bb.utils.mkdirhier(archconfdir) - open(archconfdir + "arch", 'w').write(":".join(archs)) + confdir = "%s/%s" %(self.target_rootfs, "etc/dnf/vars/") + bb.utils.mkdirhier(confdir) + open(confdir + "arch", 'w').write(":".join(archs)) + distro_codename = self.d.getVar('DISTRO_CODENAME') + open(confdir + "releasever", 'w').write(distro_codename if distro_codename is not None else '') open(oe.path.join(self.target_rootfs, "etc/dnf/dnf.conf"), 'w').write("") -- cgit 1.2.3-korg