From 3752836b284edf7b1117a709fb68aae209aaa55a Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 21:03:40 +0100
Subject: [PATCH] add upstream patch to fix error in chroot_call  in EFI
 installation require grub and grub-efi-x86_64 [release 1.0.1-7mamba;Sat Mar
 07 2015]

---
 calamares-1.0.1-replace_chroot_call.patch | 13 +++++++++++++
 calamares.spec                            | 12 +++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 calamares-1.0.1-replace_chroot_call.patch

diff --git a/calamares-1.0.1-replace_chroot_call.patch b/calamares-1.0.1-replace_chroot_call.patch
new file mode 100644
index 0000000..5336152
--- /dev/null
+++ b/calamares-1.0.1-replace_chroot_call.patch
@@ -0,0 +1,13 @@
+--- calamares-1.0.1/src/modules/grub/main.py.orig	2015-03-07 13:37:38.315162881 +0100
++++ calamares-1.0.1/src/modules/grub/main.py	2015-03-07 13:39:03.078129593 +0100
+@@ -35,8 +35,8 @@
+             efi_bootloader_id = distribution.translate(file_name_sanitizer)
+         check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", "--efi-directory={!s}".format(efi_directory), "--bootloader-id={!s}".format(efi_bootloader_id)])
+         # Workaround for some UEFI firmwares
+-        chroot_call(["mkdir", "-p", "{!s}/EFI/boot".format(efi_directory)])
+-        chroot_call(["cp", "{!s}/EFI/{!s}/grubx64.efi".format(efi_directory,efi_bootloader_id), "{!s}/EFI/boot/bootx64.efi".format(efi_directory)])
++        check_chroot_call(["mkdir", "-p", "{!s}/EFI/boot".format(efi_directory)])
++        check_chroot_call(["cp", "{!s}/EFI/{!s}/grubx64.efi".format(efi_directory,efi_bootloader_id), "{!s}/EFI/boot/bootx64.efi".format(efi_directory)])
+     else:
+         install_path = boot_loader["installPath"]
+         check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc", install_path])
diff --git a/calamares.spec b/calamares.spec
index 8b2c101..ecdade9 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -1,6 +1,6 @@
 Name:          calamares
 Version:       1.0.1
-Release:       6mamba
+Release:       7mamba
 Summary:       Distribution-independent installer framework
 Group:         Graphical Desktop/Applications/Utilities
 Vendor:        openmamba
@@ -16,6 +16,7 @@ Patch2:        calamares-1.0.1-displaymanager_fix_paths_openmamba.patch
 Patch3:        calamares-1.0.1-fix_reboot.patch
 Patch4:        calamares-1.0.1-dracut_hostonly.patch
 Patch5:        calamares-1.0.1-locale_use_LANG.patch
+Patch6:        calamares-1.0.1-replace_chroot_call.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -37,6 +38,10 @@ BuildRequires: libyaml-cpp-devel
 BuildRequires: cmake
 BuildRequires: libpolkit-qt5-1-devel
 BuildRequires: libboost-devel >= 1.57.0-3mamba
+%ifarch x86_64 %{ix86}
+Requires:      grub
+Requires:      grub-efi-x86_64
+%endif
 Requires:      libqt5-plugins
 Requires:      squashfs
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
@@ -70,6 +75,7 @@ This package contains libraries and header files for developing applications tha
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 rmdir src/modules/partition/partitionmanager
 mv partitionmanager-%{version}  src/modules/partition/partitionmanager
@@ -192,6 +198,10 @@ install -D -m0755 src/branding/default/squid.png %{buildroot}%{_datadir}/pixmaps
 
 
 %changelog
+* Sat Mar 07 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.1-7mamba
+- add upstream patch to fix error in chroot_call  in EFI installation
+- require grub and grub-efi-x86_64
+
 * Fri Feb 20 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.1-6mamba
 - fix for kdm detection in displaymanager patch
 - patch to fix reboot by not using /bin/sh