Bump version to 27.0 (ngompa13)
imgcreate/creator: Change to text strings for reading file list from rpm (ngompa13) imgcreate/live: Check for dracut being installed to determine usability (ngompa13) imgcreate/live: Add squashfs as a mandatory extra filesystem (ngompa13) imgcreate/live: Rename dracut config file to 99-liveos.conf (ngompa13) 'udevadm settle' needs some time to settle (sbonds) README: Removed unnecessary 'the' (scwicker) imgcreate/kickstart: Use systemctl for enabling/disabling services (ngompa13) livecd-iso-to-disk: Simply mount read-only to test for flat_squashfs. (fgrose) editliveos: Accommodate netinstall in multi boot configuration files. (fgrose) livecd-iso-to-disk+pod: Support netinstall .isos and as multi install. (fgrose)
This commit is contained in:
parent
7f741c1b21
commit
babf83750c
1
.gitignore
vendored
1
.gitignore
vendored
@ -16,3 +16,4 @@
|
|||||||
/livecd-tools-25.0.tar.gz
|
/livecd-tools-25.0.tar.gz
|
||||||
/livecd-tools-26.0.tar.gz
|
/livecd-tools-26.0.tar.gz
|
||||||
/livecd-tools-26.1.tar.gz
|
/livecd-tools-26.1.tar.gz
|
||||||
|
/livecd-tools-27.0.tar.gz
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
From 13d352e87d2bc055273e34760ba8b389270519ed Mon Sep 17 00:00:00 2001
|
|
||||||
From: Neal Gompa <ngompa13@gmail.com>
|
|
||||||
Date: Thu, 4 Apr 2019 07:01:17 -0400
|
|
||||||
Subject: [PATCH] Use systemctl instead of chkconfig for enabling/disabling
|
|
||||||
services
|
|
||||||
|
|
||||||
---
|
|
||||||
imgcreate/kickstart.py | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
|
|
||||||
index 32d26b2..62396b3 100644
|
|
||||||
--- a/imgcreate/kickstart.py
|
|
||||||
+++ b/imgcreate/kickstart.py
|
|
||||||
@@ -267,11 +267,11 @@ class ServicesConfig(KickstartConfig):
|
|
||||||
"""A class to apply a kickstart services configuration to a system."""
|
|
||||||
def apply(self, ksservices):
|
|
||||||
|
|
||||||
- if fs.chrootentitycheck('chkconfig', self.instroot):
|
|
||||||
+ if fs.chrootentitycheck('systemctl', self.instroot):
|
|
||||||
for s in ksservices.enabled:
|
|
||||||
- subprocess.call(['chkconfig', s, 'on'], preexec_fn=self.chroot)
|
|
||||||
+ subprocess.call(['systemctl', 'enable', s], preexec_fn=self.chroot)
|
|
||||||
for s in ksservices.disabled:
|
|
||||||
- subprocess.call(['chkconfig', s, 'off'], preexec_fn=self.chroot)
|
|
||||||
+ subprocess.call(['systemctl', 'disable', s], preexec_fn=self.chroot)
|
|
||||||
|
|
||||||
class XConfig(KickstartConfig):
|
|
||||||
"""A class to apply a kickstart X configuration to a system."""
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
|||||||
From e9f51002c7dd0749723843f0c2270789faa01956 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Neal Gompa <ngompa13@gmail.com>
|
|
||||||
Date: Fri, 12 Apr 2019 21:28:13 -0400
|
|
||||||
Subject: [PATCH] creator: Change to text strings for reading file list from
|
|
||||||
rpm
|
|
||||||
|
|
||||||
RPM changed its Python bindings for the RPM 4.15 release so that
|
|
||||||
everything is returned as text strings rather than byte arrays.
|
|
||||||
|
|
||||||
Adapt accordingly.
|
|
||||||
---
|
|
||||||
imgcreate/creator.py | 7 ++-----
|
|
||||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
|
|
||||||
index 51d92c7..e77a532 100644
|
|
||||||
--- a/imgcreate/creator.py
|
|
||||||
+++ b/imgcreate/creator.py
|
|
||||||
@@ -306,12 +306,9 @@ class ImageCreator(object):
|
|
||||||
def get_version(header):
|
|
||||||
version = None
|
|
||||||
for f in header['filenames']:
|
|
||||||
- if f.startswith(b'/boot/vmlinuz-'):
|
|
||||||
+ if f.startswith('/boot/vmlinuz-'):
|
|
||||||
version = f[14:]
|
|
||||||
- if version is None:
|
|
||||||
- return version
|
|
||||||
- else:
|
|
||||||
- return version.decode("utf-8")
|
|
||||||
+ return version
|
|
||||||
|
|
||||||
ts = rpm.TransactionSet(self._instroot)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@ -16,21 +16,13 @@
|
|||||||
|
|
||||||
Summary: Tools for building live CDs
|
Summary: Tools for building live CDs
|
||||||
Name: livecd-tools
|
Name: livecd-tools
|
||||||
Version: 26.1
|
Version: 27.0
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://github.com/livecd-tools/livecd-tools
|
URL: https://github.com/livecd-tools/livecd-tools
|
||||||
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
|
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
# Backport from upstream
|
|
||||||
## Use systemctl instead of chkconfig (rhbz#1696064)
|
|
||||||
Patch0001: 0001-Use-systemctl-instead-of-chkconfig-for-enabling-disa.patch
|
|
||||||
|
|
||||||
# Proposed changes
|
|
||||||
## Change from bytearrays to strings for data from rpm Python bindings
|
|
||||||
Patch0101: 0101-creator-Change-to-text-strings-for-reading-file-list.patch
|
|
||||||
|
|
||||||
%if %{with python2}
|
%if %{with python2}
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
%endif
|
%endif
|
||||||
@ -161,13 +153,7 @@ Tools for installing Live CD ISOs to different mediums
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
%patch0001 -p1
|
|
||||||
|
|
||||||
%if 0%{?fedora} >= 31
|
|
||||||
# Apply only if new rpm Python binding semantics exist
|
|
||||||
%patch0101 -p1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Nothing to do
|
# Nothing to do
|
||||||
@ -231,6 +217,24 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Apr 14 2019 Neal Gompa <ngompa13@gmail.com> - 1:27.0-1
|
||||||
|
- Bump version to 27.0 (ngompa13)
|
||||||
|
- imgcreate/creator: Change to text strings for reading file list from rpm
|
||||||
|
(ngompa13)
|
||||||
|
- imgcreate/live: Check for dracut being installed to determine usability
|
||||||
|
(ngompa13)
|
||||||
|
- imgcreate/live: Add squashfs as a mandatory extra filesystem (ngompa13)
|
||||||
|
- imgcreate/live: Rename dracut config file to 99-liveos.conf (ngompa13)
|
||||||
|
- 'udevadm settle' needs some time to settle (sbonds)
|
||||||
|
- README: Removed unnecessary 'the' (scwicker)
|
||||||
|
- imgcreate/kickstart: Use systemctl for enabling/disabling services (ngompa13)
|
||||||
|
- livecd-iso-to-disk: Simply mount read-only to test for flat_squashfs.
|
||||||
|
(fgrose)
|
||||||
|
- editliveos: Accommodate netinstall in multi boot configuration files.
|
||||||
|
(fgrose)
|
||||||
|
- livecd-iso-to-disk+pod: Support netinstall .isos and as multi install.
|
||||||
|
(fgrose)
|
||||||
|
|
||||||
* Fri Apr 12 2019 Neal Gompa <ngompa13@gmail.com> - 1:26.1-4
|
* Fri Apr 12 2019 Neal Gompa <ngompa13@gmail.com> - 1:26.1-4
|
||||||
- Add patch to adapt to rpm Python bindings changing from bytes to strings (RH#1699432)
|
- Add patch to adapt to rpm Python bindings changing from bytes to strings (RH#1699432)
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (livecd-tools-26.1.tar.gz) = 240c13ec615b7c181227ad4223743f8221b27025184124001274d92c3a92c01755bf17fd91e86c5844535dc4e09387da1e2952faa004929d74a077850db9e8a6
|
SHA512 (livecd-tools-27.0.tar.gz) = 35a94f96b3b935ae06bf2447a06297237b6ce4893007f222c857df6626bbefcba64a1b1b2b2731508a21b716a0c51609890d506108fcca3c5adcef1e30928491
|
||||||
|
Loading…
Reference in New Issue
Block a user