Compare commits

..

No commits in common. "master" and "f26" have entirely different histories.
master ... f26

3 changed files with 27 additions and 202 deletions

4
.gitignore vendored
View File

@ -14,7 +14,3 @@
/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

View File

@ -7,43 +7,33 @@
%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: 27.1
Release: 6%{?dist}
%if 0%{?fedora}
Version: 25.0
Release: 1%{?dist}
Epoch: 1
%endif
License: GPLv2
Group: System Environment/Base
URL: https://github.com/livecd-tools/livecd-tools
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
%if %{with python2}
BuildRequires: python2-devel
%endif
%if %{with python3}
BuildRequires: python3-devel
%endif
BuildRequires: /usr/bin/pod2man
%if %{with python3}
Requires: python3-imgcreate = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: python3-imgcreate = %{epoch}:%{version}-%{release}
%else
Requires: python2-imgcreate = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: python2-imgcreate = %{epoch}:%{version}-%{release}
%endif
# For splitting out livecd-iso-to-disk to separate subpackage
Conflicts: livecd-tools < 25.0
%ifarch %{ix86} x86_64
Requires: livecd-iso-to-mediums = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: livecd-iso-to-mediums = %{epoch}:%{version}-%{release}
%endif
%description
@ -53,8 +43,9 @@ 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: xorriso >= 1.4.8
Requires: genisoimage
Requires: isomd5sum
Requires: parted
Requires: util-linux
@ -62,75 +53,50 @@ 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
# dracut 045+ required for overlayfs live media support
Requires: dracut
%if ! %{with python2}
Obsoletes: python2-imgcreate < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
Requires: dracut >= 045
%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:%{epoch}:}%{version}-%{release}
Requires: python2-dnf >= 1.1.0
%if 0%{?rhel} && 0%{?rhel} < 8
Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pyparted
Requires: pykickstart
Requires: python2-dnf >= 1.1.0
Requires: python-kickstart
Requires: python-six
Requires: libselinux-python
Requires: dbus-python
Requires: python-six
%else
Requires: python2-pyparted
Requires: python2-kickstart
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:%{epoch}:}%{version}-%{release}
Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
Requires: python3-pyparted
Requires: python3-dnf >= 1.1.0
Requires: python3-kickstart
@ -146,7 +112,11 @@ like live image or appliances.
%ifarch %{ix86} x86_64
%package -n livecd-iso-to-mediums
Summary: Tools for installing ISOs to different mediums
Requires: python-imgcreate-sysdeps%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
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
@ -161,18 +131,16 @@ 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 docs, we'll grab them later
rm -rf %{buildroot}%{_datadir}/doc/%{name}
# Delete license file from docs, we'll grab it later
rm -rf %{buildroot}%{_datadir}/doc/%{name}/COPYING
%ifnarch %{ix86} x86_64
# livecd-iso-to-mediums doesn't work without syslinux
@ -190,18 +158,17 @@ 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
@ -219,144 +186,6 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
%endif
%changelog
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1:27.1-6
- Rebuilt for Python 3.9
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:27.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1:27.1-4
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1:27.1-3
- Rebuilt for Python 3.8
* 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
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:25.0-9
- Rebuilt for Python 3.7
* Wed Jun 27 2018 Adam Williamson <awilliam@redhat.com> - 1:25.0-8
- Work around a DNF 3 bug that breaks repo setup (#1595917)
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1:25.0-7
- Rebuilt for Python 3.7
* Thu Mar 22 2018 Patrick Uiterwijk <puiterwijk@redhat.com> - 1:25.0-6
- Revert patch to use restorecon due to unloaded selinux policy
* Thu Mar 22 2018 Patrick Uiterwijk <puiterwijk@redhat.com> - 1:25.0-5
- Require selinux-policy-targeted in imgcreate-sysdeps
* Tue Feb 20 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1:25.0-4
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:25.0-3
- Escape macros in %%changelog
* Wed Feb 07 2018 Patrick Uiterwijk <patrick@puiterwijk.org> - 1:25.0-2
- Backport patch to fix appliance-creator
* Sat Oct 21 2017 Neal Gompa <ngompa13@gmail.com> - 25.0-1
- Bump version to 25.0 (ngompa13)
- Set the correct partition size for minimal Mageia kickstarts (ngompa13)
@ -838,7 +667,7 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
- Version 16.1 (bcl)
- Print reason for sudden exit (bcl)
- Fix skipcopy usage with DVD iso (#644194) (bmj001)
- Move selinux relabel to after %%post (#648591) (bcl)
- Move selinux relabel to after %post (#648591) (bcl)
- Add support for virtio disks to livecd (#672936) (bcl)
- Support attached LiveOS devices as well as image files for LiveOS editing.
(fgrose)

View File

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