diff --git a/0001-Enable-USB-controller-and-keyboard-for-aarch64-for-a.patch b/0001-Enable-USB-controller-and-keyboard-for-aarch64-for-a.patch new file mode 100644 index 0000000..08a54bf --- /dev/null +++ b/0001-Enable-USB-controller-and-keyboard-for-aarch64-for-a.patch @@ -0,0 +1,26 @@ +From 54789ef242008cf12d651694a2aa8dd29b13ae1f Mon Sep 17 00:00:00 2001 +From: Alex Iribarren +Date: Tue, 22 Feb 2022 16:36:20 +0100 +Subject: [PATCH] Enable USB controller and keyboard for aarch64 for all + libvirt types + +--- + oz/Guest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/oz/Guest.py b/oz/Guest.py +index d0e0f06887c1aa8292c9f66ab1aae2d9d4a25f80..5197067f9e5422e1a21e927cfb7b7972a9d30fcc 100644 +--- a/oz/Guest.py ++++ b/oz/Guest.py +@@ -531,7 +531,7 @@ class Guest(object): + elif self.mousetype == "usb": + mousedict['type'] = 'tablet' + oz.ozutil.lxml_subelement(devices, "input", None, mousedict) +- if self.tdl.arch in ["aarch64", "armv7l"] and self.libvirt_type == "kvm": ++ if self.tdl.arch in ["aarch64", "armv7l"]: + # Other arches add a keyboard by default, for historical reasons ARM doesn't + # so we add it here so graphical works and hence we can get debug screenshots RHBZ 1538637 + oz.ozutil.lxml_subelement(devices, 'controller', None, {'type': 'usb', 'index': '0'}) +-- +2.37.3 + diff --git a/oz.spec b/oz.spec index 7897521..1235c6b 100644 --- a/oz.spec +++ b/oz.spec @@ -1,6 +1,6 @@ Name: oz Version: 0.18.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library and utilities for automated guest OS installs License: LGPLv2 URL: http://github.com/clalancette/oz @@ -12,6 +12,9 @@ Source0: https://github.com/clalancette/%{name}/archive/v%{version}/%{name}-%{ve # https://github.com/clalancette/oz/pull/297 Patch0: 0001-Revert-Don-t-write-kickstart-so-initial-setup-won-t-.patch +# Upstream patch to enable the usb controller for aarch64 +Patch1: 0001-Enable-USB-controller-and-keyboard-for-aarch64-for-a.patch + BuildArch: noarch BuildRequires: python3 @@ -89,6 +92,9 @@ fi %{python3_sitelib}/%{name}*.egg-info %changelog +* Mon Oct 03 2022 Stephen Gallagher - 0.18.1-5 +- Backport upstream patch to enable the USB controller on aarch64 + * Fri Jul 22 2022 Fedora Release Engineering - 0.18.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild