rpms
/
livecd-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'up/f31' into master-riscv64 

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2019-10-03 13:51:31 +03:00
parent fdfcc55a82 edf574ccce
commit c16271b274
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
6 changed files with 150 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -14,3 +14,7 @@
/livecd-tools-24.3.tar.gz
/livecd-tools-24.4.tar.gz
/livecd-tools-25.0.tar.gz
/livecd-tools-26.0.tar.gz
/livecd-tools-26.1.tar.gz
/livecd-tools-27.0.tar.gz
/livecd-tools-27.1.tar.gz

38
0001-DNF-3-workaround-a-bug-with-config-values-that-are-l.patch
View File

@ -1,38 +0,0 @@
From 676b1e1261b442a80cdf2cbb96d192b1db02b894 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 27 Jun 2018 11:51:50 -0700
Subject: [PATCH] DNF 3: workaround a bug with config values that are lists
There's a bug / overly-clever-design flaw in DNF 3 that prevents
us appending to config values that appear to be lists, even
though lists should be mutable objects and this *ought* to work
(and did work in DNF 2):
https://bugzilla.redhat.com/show_bug.cgi?id=1595917
This works around it.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
imgcreate/dnfinst.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/imgcreate/dnfinst.py b/imgcreate/dnfinst.py
index 8e28f34..a81f04b 100644
--- a/imgcreate/dnfinst.py
+++ b/imgcreate/dnfinst.py
@@ -179,7 +179,10 @@ class DnfLiveCD(dnf.Base):
# dnf 1
repo = dnf.repo.Repo(name, cachedir = self.conf.cachedir)
if url:
- repo.baseurl.append(_varSubstitute(url))
+ # some overly clever trickery in dnf 3 prevents us just
+ # using repo.baseurl.append here:
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1595917
+ repo.baseurl = repo.baseurl + [_varSubstitute(url)]
if mirrorlist:
repo.mirrorlist = _varSubstitute(mirrorlist)
repo.enable()
--
2.18.0.rc2

50
491a49ff9aedf5197af3e4dcb0f50351db3cddf0.patch
View File

@ -1,50 +0,0 @@
From 491a49ff9aedf5197af3e4dcb0f50351db3cddf0 Mon Sep 17 00:00:00 2001
From: David Cantrell <david.l.cantrell@gmail.com>
Date: Thu, 18 Jan 2018 15:20:18 -0500
Subject: [PATCH] Remove get_modules().
This kickstart command has been deprecated for a long time anyway and it
has been removed in pykickstart 3.9.
---
imgcreate/kickstart.py | 15 ---------------
imgcreate/live.py | 1 -
2 files changed, 16 deletions(-)
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index e7997ca..7d92b5b 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -533,21 +533,6 @@ def get_image_fstype(ks, default = None):
return p.fstype
return default
-def get_modules(ks):
- devices = []
- if not hasattr(ks.handler.device, "deviceList"):
- devices.append(ks.handler.device)
- else:
- devices.extend(ks.handler.device.deviceList)
-
- modules = []
- for device in devices:
- if not device.moduleName:
- continue
- modules.extend(device.moduleName.split(":"))
-
- return modules
-
def get_timeout(ks, default = None):
if not hasattr(ks.handler.bootloader, "timeout"):
return default
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 1f332dd..b3da184 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -90,7 +90,6 @@ def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp",
"=mmc", "=pcmcia", "mptsas", "udf", "virtio_blk",
"virtio_pci", "virtio_scsi", "virtio_net", "virtio_mmio",
"virtio_balloon", "virtio-rng"]
- self.__modules.extend(kickstart.get_modules(self.ks))
self._isofstype = "iso9660"
self.base_on = False

20
livecd-tools-revert-restorecon.patch
View File

@ -1,20 +0,0 @@
diff -rup livecd-tools-25.0.orig/imgcreate/kickstart.py livecd-tools-25.0/imgcreate/kickstart.py
--- livecd-tools-25.0.orig/imgcreate/kickstart.py 2018-03-22 12:52:20.229454637 +0100
+++ livecd-tools-25.0/imgcreate/kickstart.py 2018-03-22 14:12:41.619989962 +0100
@@ -479,12 +479,12 @@ class SelinuxConfig(KickstartConfig):
return
try:
- rc = subprocess.call(['restorecon', '-p', '-e', '/proc', '-e',
- '/sys', '-e', '/dev', '-F', '-R', '/'],
- preexec_fn=self.chroot)
+ rc = self.call(["/sbin/setfiles", "-p", "-e", "/proc", "-e",
+ "/sys", "-e", "/dev",
+ selinux.selinux_file_context_path(), "/"])
except OSError as e:
if e.errno == errno.ENOENT:
- logging.info('The restorecon command is not available.')
+ logging.info('The fixfiles command is not available.')
return
if rc:
if ksselinux.selinux == ksconstants.SELINUX_ENFORCING:

173
livecd-tools.spec
View File

@ -7,25 +7,25 @@
%bcond_without python3
%endif
# Do not build Python 2 for Fedora 30+ and RHEL 8+
%if 0%{?fedora} > 29 || 0%{?rhel} >= 8
%bcond_with python2
%else
%bcond_without python2
%endif
Summary: Tools for building live CDs
Name: livecd-tools
Version: 25.0
Release: 10.0.riscv64%{?dist}
Version: 27.1
Release: 2%{?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
Patch0: https://github.com/livecd-tools/livecd-tools/commit/491a49ff9aedf5197af3e4dcb0f50351db3cddf0.patch
Patch1: livecd-tools-revert-restorecon.patch
# Workaround an issue in DNF 3:
# https://bugzilla.redhat.com/show_bug.cgi?id=1595917
# https://github.com/weldr/lorax/pull/388
Patch2: 0001-DNF-3-workaround-a-bug-with-config-values-that-are-l.patch
Patch3: livecd-tools-25.0-add-riscv64.patch
%if %{with python2}
BuildRequires: python2-devel
%endif
%if %{with python3}
BuildRequires: python3-devel
%endif
@ -51,9 +51,8 @@ http://fedoraproject.org/wiki/FedoraLiveCD for more details.
%package -n python-imgcreate-sysdeps
Summary: Common system dependencies for python-imgcreate
Group: System Environment/Base
Requires: coreutils
Requires: genisoimage
Requires: xorriso >= 1.4.8
Requires: isomd5sum
Requires: parted
Requires: util-linux
@ -61,49 +60,73 @@ Requires: dosfstools >= 2.11-8
Requires: e2fsprogs
Requires: lorax >= 18.3
Requires: rsync
# hfs+ support for Macs
%ifarch %{ix86} x86_64 ppc ppc64
Requires: hfsplus-tools
%endif
# syslinux dependency
%ifarch %{ix86} x86_64
%if 0%{?rhel} && 0%{?rhel} < 8
Requires: syslinux >= 4.05-13
%else
Requires: syslinux >= 6.02-4
Requires: syslinux-nonlinux >= 6.02-4
Requires: /sbin/extlinux
%endif
Requires: syslinux-extlinux
%endif
# For legacy ppc32 systems
%ifarch ppc
Requires: yaboot
%endif
Requires: dumpet
Requires: sssd-client
Requires: cryptsetup
Requires: squashfs-tools
Requires: policycoreutils
Requires: selinux-policy-targeted
Requires: dracut >= 045
# dracut 045+ required for overlayfs live media support
Requires: dracut
%if ! %{with python2}
Obsoletes: python2-imgcreate < %{epoch}:%{version}-%{release}
%endif
%description -n python-imgcreate-sysdeps
This package describes the common system dependencies for
python-imgcreate.
%if %{with python2}
%package -n python2-imgcreate
Summary: Python 2 modules for building system images
Group: System Environment/Base
%{?python_provide:%python_provide python2-imgcreate}
Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
Requires: python2-pyparted
Requires: python2-dnf >= 1.1.0
%if 0%{?rhel} && 0%{?rhel} < 8
Requires: pyparted
Requires: pykickstart
Requires: libselinux-python
Requires: dbus-python
Requires: python-six
%else
Requires: python2-pyparted
Requires: python2-kickstart
Requires: python2-six
Requires: python2-libselinux
Requires: python2-dbus
Requires: python2-six
%endif
%description -n python2-imgcreate
Python 2 modules that can be used for building images for things
like live image or appliances.
%endif
%if %{with python3}
%package -n python3-imgcreate
Summary: Python 3 modules for building system images
Group: System Environment/Base
%{?python_provide:%python_provide python3-imgcreate}
Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
Requires: python3-pyparted
@ -121,11 +144,7 @@ like live image or appliances.
%ifarch %{ix86} x86_64
%package -n livecd-iso-to-mediums
Summary: Tools for installing ISOs to different mediums
Group: System Environment/Base
Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
Requires: syslinux >= 6.02-4
Requires: syslinux-nonlinux >= 6.02-4
Requires: /sbin/extlinux
Conflicts: livecd-tools < 25.0
%description -n livecd-iso-to-mediums
@ -140,16 +159,18 @@ Tools for installing Live CD ISOs to different mediums
# Nothing to do
%install
%if %{with python2}
# Install Python 2 stuff
%make_install PYTHON=python2
%endif
%if %{with python3}
# Install Python 3 stuff
%make_install PYTHON=python3
%endif
# Delete license file from docs, we'll grab it later
rm -rf %{buildroot}%{_datadir}/doc/%{name}/COPYING
# Delete docs, we'll grab them later
rm -rf %{buildroot}%{_datadir}/doc/%{name}
%ifnarch %{ix86} x86_64
# livecd-iso-to-mediums doesn't work without syslinux
@ -167,17 +188,18 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
%{_bindir}/livecd-creator
%{_bindir}/image-creator
%{_bindir}/liveimage-mount
%{_bindir}/edit-livecd
%{_bindir}/editliveos
%{_bindir}/mkbiarch
%files -n python-imgcreate-sysdeps
# No files because empty metapackage
%if %{with python2}
%files -n python2-imgcreate
%license COPYING
%doc API
%{python2_sitelib}/imgcreate
%endif
%if %{with python3}
%files -n python3-imgcreate
@ -195,8 +217,103 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
%endif
%changelog
* Wed Aug 01 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:25.0-10.0.riscv64
- Add support for riscv64
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:27.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Apr 19 2019 Neal Gompa <ngompa13@gmail.com> - 1:27.1-1
- Bump version to 27.1 (ngompa13)
- Fix Kernel version detection (pablo)
* 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
- Add patch to adapt to rpm Python bindings changing from bytes to strings (RH#1699432)
* Thu Apr 04 2019 Neal Gompa <ngompa13@gmail.com> - 1:26.1-3
- Backport fix from upstream to use systemctl instead of chkconfig (RH#1696064)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:26.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Dec 08 2018 Neal Gompa <ngompa13@gmail.com> - 1:26.1-1
- Bump version to 26.1 (ngompa13)
- Run setfiles after chroot (noto.kazufumi)
- imgcreate/dnfinst: Force latest packages from only specified repos (ngompa13)
* 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+
* Fri Nov 23 2018 Neal Gompa <ngompa13@gmail.com> - 1:26.0-1
- Bump version to 26.0 (ngompa13)
- imgcreate/kickstart: Exclude /sys from SELinux labeling (ngompa13)
- imgcreate/live: Switch to single-step ISO hybridization by xorrisofs
(ngompa13)
- Use xorrisofs instead of genisoimage (ngompa13)
- imgcreate/live: Drop UDF support (ngompa13)
- Fix excludeWeakdeps for older pykickstart versions (pablo)
- README: Update to include --flat-squashfs option. (fgrose)
- editliveos: Fix inconsistent ops argument. (fgrose)
- livecd-iso-to-disk: Accept both dracut 045-8 and 049+ for OverlayFS. (fgrose)
- README: Update to include liveimage-mount & editliveos tools. (fgrose)
- config/livecd-fedora-minimal.ks: Increase root partition size. (fgrose)
- Support a flattened squashfs.img & non-standard image & overlay paths.
(fgrose)
- livecd-iso-to-disk: Support netinstall .iso (fgrose)
- edit-livecd: Delete unmaintained script superceded by editliveos. (fgrose)
- Handle dnf config option showing as tuple, not list, in DNF 3.6 (awilliam)
- live.py: Fix unreported logging.error (fgrose)
- livecd-iso-to-disk: Skip Multi Image query on --skipcopy condition. (fgrose)
- livecd-iso-to-disk: Tighten permissions on some files. (fgrose)
- DNF 3: workaround a bug with config values that are lists (awilliam)
- Add support for RISC-V (riscv64) (david.abdurachmanov)
- Revert "Use restorecon instead of setfiles for relabeling" (puiterwijk)
- imgcreate: Copy gcdia32.efi in __copy_efi_files if it exists (Kevin)
- Fix the io.open() and utf-8 problems in imgcreate/util.py (david.l.cantrell)
- Remove get_modules(). (david.l.cantrell)
- livecd-iso-to-disk: adjust efi boot configuration code. (fgrose)
- fs.py & editliveos: remove code glitches (fgrose)
- editliveos: Bind mount /etc/resolv.conf (fgrose)
- fs.py & editliveos: Fix overlay changing. (fgrose)
- util.py: Captured output from subprocesses should always be decoded. (scott)
- Update livecd-creator manpage with info about imcomplete options
(zhang.xianwei8)
- livecd-iso-to-disk: Revert change that broke EFI/MBR hybrid booting (scott)
- livecd-iso-to-disk: Fix faulty --efi boot config code. (fgrose)
- livecd-iso-to-disk: Fix overlay size reporting & type testing. (fgrose)
- livecd-iso-to-disk: Accommodate multiple BOOT*.EFI files. (fgrose)
* Thu Nov 22 2018 Neal Gompa <ngompa13@gmail.com> - 1:25.0-14
- Backport workaround for lack of excludeWeakDeps with EL7 pykickstart
* Thu Nov 15 2018 Neal Gompa <ngompa13@gmail.com> - 1:25.0-13
- Fix when Python 2 subpackage is obsoleted
- Fix up EL7 support
* Tue Nov 13 2018 Neal Gompa <ngompa13@gmail.com> - 1:25.0-12
- Drop Python 2 subpackage for F30+/RHEL8+
* Wed Sep 26 2018 Adam Williamson <awilliam@redhat.com> - 1:25.0-11
- Backport further fix for #1595917
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:25.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (livecd-tools-25.0.tar.gz) = 8b42fce8148d699e08611a8dcfa49a1f90c53f8df57d6debd1d873727ca8d097445c02b25a990f57e5778fb4e4235ea7a3cd2bf8af21d9431cad666b9823ef4d
SHA512 (livecd-tools-27.1.tar.gz) = f5a744248d04b89e930e35fd52917412c6e97a800c4da6f9064a74a1bd7fd37bcc64eb38c222018d7e4fcb0686ede79ac4f3db5ea2b70fb7d062e79b441a2bd1