From 1ec641eab8e586cdcf925380ecffb4f5b9299eb8 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 21 Oct 2017 14:25:09 -0400 Subject: [PATCH] Bump version to 25.0 (ngompa13) Set the correct partition size for minimal Mageia kickstarts (ngompa13) editliveos: A full featured replacement for tools/edit-livecd. (fgrose) fs.py: Add functions and classes to support Live Image Mounting. (fgrose) creator.py, live.py: Allow more options to be passed to functions. (fgrose) debug.py: Add support for argparse parser. (fgrose) fs.py: Allow more options to be passed to functions. (fgrose) util.py: Add a subprocess call that returns standard values. (fgrose) Remove absolute directories on external program call paths. (fgrose) livecd-iso-to-disk: Allow auto --multi install. (fgrose) Fix ARM architecture check (ngompa13) Declare the literal "kernel-" as a byte array to fix crash (ngompa13) livecd-iso-to-disk: Fix boot configuration for images lacking /EFI (fgrose) livecd-iso-to-disk: Fix space evaluation for images lacking /EFI (fgrose) Use restorecon instead of setfiles for relabeling (scott) liveimage-mount: Add support for OverlayFS overlays. (fgrose) livecd-iso-to-disk+pod: Enable a --copy-overlay option. (fgrose) livecd-iso-to-disk+pod: Enable a --copy-home option. (fgrose) livecd-iso-to-disk+pod: Add --overlayfs option for overlay. (fgrose) livecd-iso-to-disk+pod: Allow multi installs to live booted devices (fgrose) livecd-iso-to-disk: Fix sed for kernelargs. (fgrose) livecd-iso-to-disk: Adjust syslinux default menu style, as needed. (fgrose) --- .gitignore | 1 + livecd-tools.spec | 68 ++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 593e045..7146af3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /livecd-tools-24.2.tar.gz /livecd-tools-24.3.tar.gz /livecd-tools-24.4.tar.gz +/livecd-tools-25.0.tar.gz diff --git a/livecd-tools.spec b/livecd-tools.spec index af40b23..65de795 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -9,8 +9,8 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 24.4 -Release: 3%{?dist} +Version: 25.0 +Release: 1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Base @@ -29,6 +29,12 @@ Requires: python3-imgcreate = %{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}:%{version}-%{release} +%endif %description Tools for generating live CDs on Fedora based systems including @@ -63,6 +69,7 @@ Requires: sssd-client Requires: cryptsetup Requires: squashfs-tools Requires: policycoreutils +Requires: dracut >= 045 %description -n python-imgcreate-sysdeps This package describes the common system dependencies for @@ -102,6 +109,21 @@ Python 3 modules that can be used for building images for things like live image or appliances. %endif +%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 +Tools for installing Live CD ISOs to different mediums +(e.g. USB sticks, hard drives, PXE boot, etc.) +%endif + %prep %autosetup -p1 @@ -120,18 +142,24 @@ like live image or appliances. # 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 +rm -rfv %{buildroot}%{_bindir}/livecd-iso-to-* +rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-* +%endif + %files %license COPYING %doc AUTHORS README HACKING %doc config/livecd-fedora-minimal.ks %doc config/livecd-mageia-minimal-*.ks %{_mandir}/man*/* +%exclude %{_mandir}/man8/livecd-iso-to-disk.8* %{_bindir}/livecd-creator -%{_bindir}/livecd-iso-to-disk -%{_bindir}/livecd-iso-to-pxeboot %{_bindir}/image-creator %{_bindir}/liveimage-mount %{_bindir}/edit-livecd +%{_bindir}/editliveos %{_bindir}/mkbiarch %files -n python-imgcreate-sysdeps @@ -149,7 +177,39 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}/COPYING %{python3_sitelib}/imgcreate %endif +%ifarch %{ix86} x86_64 +%files -n livecd-iso-to-mediums +%license COPYING +%{_bindir}/livecd-iso-to-disk +%{_bindir}/livecd-iso-to-pxeboot +%{_mandir}/man8/livecd-iso-to-disk.8* +%endif + %changelog +* Sat Oct 21 2017 Neal Gompa - 25.0-1 +- Bump version to 25.0 (ngompa13) +- Set the correct partition size for minimal Mageia kickstarts (ngompa13) +- editliveos: A full featured replacement for tools/edit-livecd. (fgrose) +- fs.py: Add functions and classes to support Live Image Mounting. (fgrose) +- creator.py, live.py: Allow more options to be passed to functions. (fgrose) +- debug.py: Add support for argparse parser. (fgrose) +- fs.py: Allow more options to be passed to functions. (fgrose) +- util.py: Add a subprocess call that returns standard values. (fgrose) +- Remove absolute directories on external program call paths. (fgrose) +- livecd-iso-to-disk: Allow auto --multi install. (fgrose) +- Fix ARM architecture check (ngompa13) +- Declare the literal "kernel-" as a byte array to fix crash (ngompa13) +- livecd-iso-to-disk: Fix boot configuration for images lacking /EFI (fgrose) +- livecd-iso-to-disk: Fix space evaluation for images lacking /EFI (fgrose) +- Use restorecon instead of setfiles for relabeling (scott) +- liveimage-mount: Add support for OverlayFS overlays. (fgrose) +- livecd-iso-to-disk+pod: Enable a --copy-overlay option. (fgrose) +- livecd-iso-to-disk+pod: Enable a --copy-home option. (fgrose) +- livecd-iso-to-disk+pod: Add --overlayfs option for overlay. (fgrose) +- livecd-iso-to-disk+pod: Allow multi installs to live booted devices (fgrose) +- livecd-iso-to-disk: Fix sed for kernelargs. (fgrose) +- livecd-iso-to-disk: Adjust syslinux default menu style, as needed. (fgrose) + * Thu Aug 03 2017 Fedora Release Engineering - 1:24.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index c3ad72f..b054d8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (livecd-tools-24.4.tar.gz) = 1a82d648efbad279dee6361c95a06f1be685c92311bce9022241d1f3904655c62fb361f2421448b6cc9767e931cbce47356d7e04343a458dbb6ad00a750f2976 +SHA512 (livecd-tools-25.0.tar.gz) = 8b42fce8148d699e08611a8dcfa49a1f90c53f8df57d6debd1d873727ca8d097445c02b25a990f57e5778fb4e4235ea7a3cd2bf8af21d9431cad666b9823ef4d