[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6470/8267] package_manager.py: set dnf's releasever setting from DISTRO_CODENAME
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 6470/8267] package_manager.py: set dnf's releasever setting from DISTRO_CODENAME
- Date: Sun, 17 Dec 2017 04:53:24 +0000 (UTC)
commit ee7c7150f0e11b9b65f18e2a4dc1893bd3fc5d3f
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date: Wed Jun 21 15:58:21 2017 +0300
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.)
(From OE-Core rev: 789e3fc225adbb61f10aaa3bbc3677856f5f0238)
Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/lib/oe/package_manager.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index bc4e301..72503eb 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("")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]