From 973d7dc325029947929e02531a501df3a8556ad9 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Feb 10 2018 14:25:31 +0000 Subject: Fix compatibility with pykickstart 3.9+ (#1544075) - Bump requires of livecd-tools to minimum version with pykickstart 3.9+ compatibility --- diff --git a/0001-Remove-usage-of-kickstart.get_modules-rhbz-1544075.patch b/0001-Remove-usage-of-kickstart.get_modules-rhbz-1544075.patch new file mode 100644 index 0000000..47fb951 --- /dev/null +++ b/0001-Remove-usage-of-kickstart.get_modules-rhbz-1544075.patch @@ -0,0 +1,26 @@ +From 31760d1f5e73caf2525859de581e11c73e405218 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sat, 10 Feb 2018 09:18:50 -0500 +Subject: [PATCH] Remove usage of kickstart.get_modules() (rhbz#1544075) + +As of pykickstart 3.9, this method doesn't exist anymore, and usage +of this was removed in livecd-tools already. +--- + appcreate/appliance.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/appcreate/appliance.py b/appcreate/appliance.py +index 61f1c46..34971a3 100644 +--- a/appcreate/appliance.py ++++ b/appcreate/appliance.py +@@ -66,7 +66,6 @@ class ApplianceImageCreator(ImageCreator): + + #additional modules to include + self.modules = ["sym53c8xx", "aic7xxx", "mptspi"] +- self.modules.extend(kickstart.get_modules(self.ks)) + + # This determines which partition layout we'll be using + self.bootloader = None +-- +2.14.3 + diff --git a/appliance-tools.spec b/appliance-tools.spec index b76698a..558faa3 100644 --- a/appliance-tools.spec +++ b/appliance-tools.spec @@ -1,7 +1,7 @@ Name: appliance-tools Summary: Tools for building Appliances Version: 008.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Base URL: https://pagure.io/appliance-tools @@ -12,9 +12,10 @@ Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 Patch0: 0001-Set-releasever.patch Patch1: 0002-Make-it-possible-to-disable-compression.patch Patch3: 0001-Use-block-size-with-xz-to-make-seekable-xz-compresse.patch +Patch4: 0001-Remove-usage-of-kickstart.get_modules-rhbz-1544075.patch # Ensure system deps are installed (rhbz#1409536) -Requires: python2-imgcreate >= 1:24.0-3 +Requires: python2-imgcreate >= 1:25.0-2 Requires: python2-urlgrabber Requires: curl rsync kpartx Requires: zlib @@ -56,6 +57,10 @@ rm -fv %{buildroot}%{_pkgdocdir}/COPYING %{python2_sitelib}/ec2convert/* %changelog +* Sat Feb 10 2018 Neal Gompa - 008.0-8 +- Fix compatibility with pykickstart 3.9+ (#1544075) +- Bump requires of livecd-tools to minimum version with pykickstart 3.9+ compatibility + * Wed Feb 07 2018 Fedora Release Engineering - 008.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild