rpms/calamares
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add upstream patch to fix error in chroot_call in EFI installation

Browse Source 
require grub and grub-efi-x86_64 [release 1.0.1-7mamba;Sat Mar 07 2015]
This commit is contained in:
Silvan Calarco 2024-01-05 21:03:40 +01:00
parent 2529743bfc
commit 3752836b28
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calamares-1.0.1-replace_chroot_call.patch Normal file
View File

@ -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])

12
calamares.spec
View File

@ -1,6 +1,6 @@
Name: calamares Name: calamares
Version: 1.0.1 Version: 1.0.1
Release: 6mamba Release: 7mamba
Summary: Distribution-independent installer framework Summary: Distribution-independent installer framework
Group: Graphical Desktop/Applications/Utilities Group: Graphical Desktop/Applications/Utilities
Vendor: openmamba Vendor: openmamba
@ -16,6 +16,7 @@ Patch2: calamares-1.0.1-displaymanager_fix_paths_openmamba.patch
Patch3: calamares-1.0.1-fix_reboot.patch Patch3: calamares-1.0.1-fix_reboot.patch
Patch4: calamares-1.0.1-dracut_hostonly.patch Patch4: calamares-1.0.1-dracut_hostonly.patch
Patch5: calamares-1.0.1-locale_use_LANG.patch Patch5: calamares-1.0.1-locale_use_LANG.patch
Patch6: calamares-1.0.1-replace_chroot_call.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -37,6 +38,10 @@ BuildRequires: libyaml-cpp-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libpolkit-qt5-1-devel BuildRequires: libpolkit-qt5-1-devel
BuildRequires: libboost-devel >= 1.57.0-3mamba BuildRequires: libboost-devel >= 1.57.0-3mamba
%ifarch x86_64 %{ix86}
Requires: grub
Requires: grub-efi-x86_64
%endif
Requires: libqt5-plugins Requires: libqt5-plugins
Requires: squashfs Requires: squashfs
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
@ -70,6 +75,7 @@ This package contains libraries and header files for developing applications tha
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
rmdir src/modules/partition/partitionmanager rmdir src/modules/partition/partitionmanager
mv partitionmanager-%{version} 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 %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 * Fri Feb 20 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.1-6mamba
- fix for kdm detection in displaymanager patch - fix for kdm detection in displaymanager patch
- patch to fix reboot by not using /bin/sh - patch to fix reboot by not using /bin/sh