Add missing fixes patch

0001-aarch64-for-linux-tty-if-acpi.patch

@@ -1,7 +1,7 @@
-From cf399db8cc44c54c620852f5a4f81357614f0cb2 Mon Sep 17 00:00:00 2001
+From bb7983845fcb7d8212e52b804ef13d1e565920e6 Mon Sep 17 00:00:00 2001
 From: Jeremy Linton <jeremy.linton@arm.com>
 Date: Fri, 11 Sep 2020 11:30:41 -0500
-Subject: [PATCH 1/2] aarch64: for linux tty if acpi
+Subject: [PATCH 1/3] aarch64: for linux tty if acpi
 
 If we are going to use ACPI with linux+edk2 we
 need to force the console because aarch64 defaults
@@ -13,7 +13,7 @@ Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/oz/Guest.py b/oz/Guest.py
-index 92bdc71..a648e9a 100644
+index 0536cfd..fb9b130 100644
 --- a/oz/Guest.py
 +++ b/oz/Guest.py
 @@ -467,8 +467,14 @@ class Guest(object):

0002-aarch64-Less-strict-CPU-checking-for-armv7-guests-on.patch

@@ -1,7 +1,7 @@
-From 59233221e1b23bd270bd9cc78f21635bb6ea7d9e Mon Sep 17 00:00:00 2001
+From 64941d84d4c0f28526e77e3ae8b21b5d912cc31f Mon Sep 17 00:00:00 2001
 From: Jeremy Linton <jeremy.linton@arm.com>
 Date: Fri, 11 Sep 2020 11:32:26 -0500
-Subject: [PATCH 2/2] aarch64: Less strict CPU checking for armv7 guests on
+Subject: [PATCH 2/3] aarch64: Less strict CPU checking for armv7 guests on
  aarch64
 
 Current versions of qemu/libvirt on f33 don't appear to allow armv7
@@ -14,7 +14,7 @@ Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/oz/Guest.py b/oz/Guest.py
-index a648e9a..701d2c4 100644
+index fb9b130..a360e01 100644
 --- a/oz/Guest.py
 +++ b/oz/Guest.py
 @@ -483,7 +483,7 @@ class Guest(object):

0003-fedora-default-to-F30-for-versions-30.patch

@@ -0,0 +1,34 @@
+From a66597b855502fd5711b507f61ef4ef1cc28000b Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sun, 4 Oct 2020 10:53:15 +0100
+Subject: [PATCH 3/3] fedora: default to F30 for versions > 30
+
+Instead of constantly updating the fedora version match logic
+we can start to use some range based selections so that it
+only needs to be updated if something changes.
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ oz/Fedora.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/oz/Fedora.py b/oz/Fedora.py
+index cdee222..4fd0b1c 100644
+--- a/oz/Fedora.py
++++ b/oz/Fedora.py
+@@ -249,7 +249,10 @@
+     def __init__(self, tdl, config, auto, nicmodel, haverepo, diskbus,  # pylint: disable=unused-argument
+                  brokenisomethod, output_disk=None, macaddress=None,    # pylint: disable=unused-argument
+                  assumed_update=None, useuefi=False):
+-        self.config = version_to_config[tdl.update]
++        if tdl.update < 31:
++            self.config = version_to_config[tdl.update]
++        else:
++            self.config = version_to_config[30]
+         if nicmodel is None:
+             nicmodel = self.config.default_netdev
+         if diskbus is None:
+-- 
+2.26.2
+

oz.spec

@@ -1,6 +1,6 @@
 Name: oz
 Version: 0.17.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Library and utilities for automated guest OS installs
 License: LGPLv2
 URL: http://github.com/clalancette/oz
@@ -25,6 +25,7 @@ Patch13: 13-add-f30-support.patch
 Patch14: oz-0.17.0-s390-input.patch
 Patch15: 0001-aarch64-for-linux-tty-if-acpi.patch
 Patch16: 0002-aarch64-Less-strict-CPU-checking-for-armv7-guests-on.patch
+Patch17: 0003-fedora-default-to-F30-for-versions-30.patch
 
 BuildArch: noarch
 
@@ -116,6 +117,9 @@ fi
 %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Sun Oct 04 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.0-11
+- Add missing fixes patch
+
 * Sat Oct 03 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.17.0-10
 - Fix screenshots on armv7/aarch64, ARMv7 fixes, drop old release conditionals