From 68b00e1695993a1f1af6d8788200a5317d56ef85 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Fri, 8 Sep 2017 20:17:53 +0200 Subject: [PATCH] Apply a UEFI booting hotfix - Make EFIGRUB._efi_binary a property, not a method (adamw) --- ...._efi_binary-a-property-not-a-method.patch | 30 +++++++++++++++++++ anaconda.spec | 10 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-Make-EFIGRUB._efi_binary-a-property-not-a-method.patch diff --git a/0001-Make-EFIGRUB._efi_binary-a-property-not-a-method.patch b/0001-Make-EFIGRUB._efi_binary-a-property-not-a-method.patch new file mode 100644 index 0000000..0cc94cd --- /dev/null +++ b/0001-Make-EFIGRUB._efi_binary-a-property-not-a-method.patch @@ -0,0 +1,30 @@ +From 9325942789d69b0ec6876a93868d5a90b1893825 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 6 Sep 2017 11:25:42 -0700 +Subject: [PATCH] Make EFIGRUB._efi_binary a property, not a method + +This was previously a class attribute and still is one for the +other classes, and the code that uses it treats it as such. So +for EFIGRUB we need to make it a property. Without this fix, +UEFI installs crash with "TypeError: must be str, not method". + +Signed-off-by: Adam Williamson +--- + pyanaconda/bootloader.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py +index 28b6cf9b2..e24dda11c 100644 +--- a/pyanaconda/bootloader.py ++++ b/pyanaconda/bootloader.py +@@ -1846,6 +1846,7 @@ class EFIGRUB(EFIBase, GRUB2): + if value == '32': + self._is_32bit_firmware = True + ++ @property + def _efi_binary(self): + if self._is_32bit_firmware: + return "\\shimia32.efi" +-- +2.13.5 + diff --git a/anaconda.spec b/anaconda.spec index 01126a6..e978524 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 28.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -15,6 +15,9 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 +# UEFI booting hotfix for rawhide +Patch0: 0001-Make-EFIGRUB._efi_binary-a-property-not-a-method.patch + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -240,6 +243,8 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q +%patch0 -p1 + %build %configure %{__make} %{?_smp_mflags} @@ -332,6 +337,9 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Fri Sep 08 2017 Martin Kolman - 28.2-2 +- Make EFIGRUB._efi_binary a property, not a method (adamw) + * Mon Sep 04 2017 Martin Kolman - 28.2-1 - Fix catch TUI not main thread exceptions (jkonecny) - Document Anaconda branching workflow (mkolman)