Backport fix from upstream to ensure latest versions install
Fix extlinux dependency for EL7
This commit is contained in:
parent
a9f91b62f1
commit
9a7e6c055e
|
@ -0,0 +1,35 @@
|
|||
From 30e6260c41a011241ed5659d2d85e72661807351 Mon Sep 17 00:00:00 2001
|
||||
From: Neal Gompa <ngompa13@gmail.com>
|
||||
Date: Sat, 24 Nov 2018 14:58:00 -0500
|
||||
Subject: [PATCH] imgcreate/dnfinst: Force latest packages from only specified
|
||||
repos
|
||||
|
||||
To ensure that the latest versions of things are picked for images,
|
||||
we'll set 'best=1' and 'obsoletes=1', just as Mock does.
|
||||
|
||||
And to make sure we don't have host system repos leak in, we'll set
|
||||
'reposdir=/dev/null', too.
|
||||
---
|
||||
imgcreate/dnfinst.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/imgcreate/dnfinst.py b/imgcreate/dnfinst.py
|
||||
index 720dd7d..06a5b24 100644
|
||||
--- a/imgcreate/dnfinst.py
|
||||
+++ b/imgcreate/dnfinst.py
|
||||
@@ -73,9 +73,11 @@ class DnfLiveCD(dnf.Base):
|
||||
conf += "plugins=1\n"
|
||||
else:
|
||||
conf += "plugins=0\n"
|
||||
- conf += "reposdir=\n"
|
||||
+ conf += "reposdir=/dev/null\n"
|
||||
conf += "failovermethod=priority\n"
|
||||
conf += "keepcache=1\n"
|
||||
+ conf += "obsoletes=1\n"
|
||||
+ conf += "best=1\n"
|
||||
conf += "tsflags=nocontexts\n"
|
||||
|
||||
f = open(confpath, "w+")
|
||||
--
|
||||
2.17.2
|
||||
|
|
@ -17,13 +17,16 @@
|
|||
Summary: Tools for building live CDs
|
||||
Name: livecd-tools
|
||||
Version: 26.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: https://github.com/livecd-tools/livecd-tools
|
||||
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Patches from upstream
|
||||
Patch0001: 0001-imgcreate-dnfinst-Force-latest-packages-from-only-sp.patch
|
||||
|
||||
%if %{with python2}
|
||||
BuildRequires: python2-devel
|
||||
%endif
|
||||
|
@ -76,7 +79,7 @@ Requires: syslinux >= 4.05-13
|
|||
Requires: syslinux >= 6.02-4
|
||||
Requires: syslinux-nonlinux >= 6.02-4
|
||||
%endif
|
||||
Requires: /sbin/extlinux
|
||||
Requires: syslinux-extlinux
|
||||
%endif
|
||||
|
||||
# For legacy ppc32 systems
|
||||
|
@ -222,6 +225,10 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Nov 24 2018 Neal Gompa <ngompa13@gmail.com> - 1:26.0-3
|
||||
- Backport fix from upstream to ensure latest versions install
|
||||
- Fix extlinux dependency for EL7
|
||||
|
||||
* Fri Nov 23 2018 Neal Gompa <ngompa13@gmail.com> - 1:26.0-2
|
||||
- Fix Obsoletes of python2-imgcreate from <F29 for F30+
|
||||
|
||||
|
|
Loading…
Reference in New Issue