diff --git a/491a49ff9aedf5197af3e4dcb0f50351db3cddf0.patch b/491a49ff9aedf5197af3e4dcb0f50351db3cddf0.patch new file mode 100644 index 0000000..61e1c54 --- /dev/null +++ b/491a49ff9aedf5197af3e4dcb0f50351db3cddf0.patch @@ -0,0 +1,50 @@ +From 491a49ff9aedf5197af3e4dcb0f50351db3cddf0 Mon Sep 17 00:00:00 2001 +From: David Cantrell +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 diff --git a/livecd-tools.spec b/livecd-tools.spec index 65de795..459184e 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -10,13 +10,15 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 25.0 -Release: 1%{?dist} +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 + BuildRequires: python2-devel %if %{with python3} BuildRequires: python3-devel @@ -186,6 +188,9 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-* %endif %changelog +* Wed Feb 07 2018 Patrick Uiterwijk - 1:25.0-2 +- Backport patch to fix appliance-creator + * 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)