Stop building unsupported 32-bit UEFI stuff
Resolves: #2038401 Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood
parent
ea946fe76d
commit
bfdc50ae19
53
grub.macros
53
grub.macros
|
|
@ -68,7 +68,6 @@
|
|||
%global efi_target_ldflags %{expand:%%(echo %{target_ldflags})}
|
||||
|
||||
%global with_efi_arch 0
|
||||
%global with_alt_efi_arch 0
|
||||
%global with_legacy_arch 0
|
||||
%global with_emu_arch 1
|
||||
%global emuarch %{_arch}
|
||||
|
|
@ -154,19 +153,6 @@
|
|||
%global legacy_target_cpu_name i386
|
||||
%global legacy_package_arch pc
|
||||
%global platform pc
|
||||
|
||||
%global alt_efi_arch ia32
|
||||
%global alt_target_cpu_name i386
|
||||
%global alt_grub_target_name i386-efi
|
||||
%global alt_platform efi
|
||||
%global alt_package_arch efi-ia32
|
||||
|
||||
%global alt_efi_host_cflags %{expand:%%(echo %{efi_host_cflags})}
|
||||
%global alt_efi_target_cflags \\\
|
||||
%{expand:%%(echo %{target_cflags} | \\\
|
||||
%{cflags_sed} \\\
|
||||
-e 's/-m64//g' \\\
|
||||
)}
|
||||
%endif
|
||||
|
||||
%ifarch aarch64
|
||||
|
|
@ -200,7 +186,6 @@
|
|||
%endif
|
||||
|
||||
%global _target_platform %{target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu}
|
||||
%global _alt_target_platform %{alt_target_cpu_name}-%{_vendor}-%{_target_os}%{?_gnu}
|
||||
|
||||
%ifarch %{efi_arch}
|
||||
%global with_efi_arch 1
|
||||
|
|
@ -216,13 +201,6 @@
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?alt_efi_arch:1}
|
||||
%global with_alt_efi_arch 1
|
||||
%global grubaltefiname grub%{alt_efi_arch}.efi
|
||||
%global grubalteficdname gcd%{alt_efi_arch}.efi
|
||||
%global grubaltefiarch %{alt_target_cpu_name}-efi
|
||||
%endif
|
||||
|
||||
%ifnarch %{efi_only}
|
||||
%global with_legacy_arch 1
|
||||
%global grublegacyarch %{legacy_target_cpu_name}-%{platform}
|
||||
|
|
@ -481,15 +459,6 @@ cd grub-%{1}-%{tarversion} \
|
|||
cd .. \
|
||||
%{nil}
|
||||
|
||||
%define do_alt_efi_build() \
|
||||
cd grub-%{1}-%{tarversion} \
|
||||
%{expand:%%do_efi_configure %%{4} %%{5} %%{6}} \
|
||||
%do_efi_build_modules \
|
||||
%{expand:%%do_efi_link_utils %{grubefiarch}} \
|
||||
%{expand:%%do_efi_build_images %{alt_grub_target_name} %{2} %{3} ../grub-%{grubefiarch}-%{tarversion}/ %{7} %{8} %{9} %{10} %{11} %{12}} \
|
||||
cd .. \
|
||||
%{nil}
|
||||
|
||||
%define do_legacy_build() \
|
||||
cd grub-%{1}-%{tarversion} \
|
||||
%configure \\\
|
||||
|
|
@ -531,26 +500,6 @@ make %{?_smp_mflags} -C grub-core \
|
|||
cd .. \
|
||||
%{nil}
|
||||
|
||||
%define do_alt_efi_install() \
|
||||
cd grub-%{1}-%{tarversion} \
|
||||
install -d -m 755 $RPM_BUILD_ROOT/usr/lib/grub/%{grubaltefiarch}/ \
|
||||
find . '(' -iname gdb_grub \\\
|
||||
-o -iname kernel.exec \\\
|
||||
-o -iname kernel.img \\\
|
||||
-o -iname config.h \\\
|
||||
-o -iname gmodule.pl \\\
|
||||
-o -iname modinfo.sh \\\
|
||||
-o -iname '*.lst' \\\
|
||||
-o -iname '*.mod' \\\
|
||||
')' \\\
|
||||
-exec cp {} $RPM_BUILD_ROOT/usr/lib/grub/%{grubaltefiarch}/ \\\; \
|
||||
find $RPM_BUILD_ROOT -type f -iname "*.mod*" -exec chmod a-x {} '\;' \
|
||||
install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2} \
|
||||
install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \
|
||||
%{expand:%%do_install_protected_file %{name}-%{alt_package_arch}} \
|
||||
cd .. \
|
||||
%{nil}
|
||||
|
||||
%define do_efi_install() \
|
||||
cd grub-%{1}-%{tarversion} \
|
||||
make DESTDIR=$RPM_BUILD_ROOT install \
|
||||
|
|
@ -592,7 +541,7 @@ if [ -f $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/%{name}.chrp ]; then \
|
|||
mv $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/%{name}.chrp \\\
|
||||
$RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/%{name}.chrp \
|
||||
fi \
|
||||
if [ %{3} -eq 0 ]; then \
|
||||
if [ %{2} -eq 0 ]; then \
|
||||
${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv \\\
|
||||
${RPM_BUILD_ROOT}/boot/%{name}/grubenv create \
|
||||
fi \
|
||||
|
|
|
|||
26
grub2.spec
26
grub2.spec
|
|
@ -14,7 +14,7 @@
|
|||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 2.06
|
||||
Release: 21%{?dist}
|
||||
Release: 22%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/grub/
|
||||
|
|
@ -157,9 +157,6 @@ This subpackage provides tools for support of all platforms.
|
|||
%if 0%{with_efi_arch}
|
||||
%{expand:%define_efi_variant %%{package_arch} -o}
|
||||
%endif
|
||||
%if 0%{with_alt_efi_arch}
|
||||
%{expand:%define_efi_variant %%{alt_package_arch}}
|
||||
%endif
|
||||
%if 0%{with_legacy_arch}
|
||||
%{expand:%define_legacy_variant %%{legacy_package_arch}}
|
||||
%endif
|
||||
|
|
@ -192,12 +189,6 @@ sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{relea
|
|||
%{SOURCE12} > grub-%{grubefiarch}-%{tarversion}/sbat.csv
|
||||
git add grub-%{grubefiarch}-%{tarversion}
|
||||
%endif
|
||||
%if 0%{with_alt_efi_arch}
|
||||
mkdir grub-%{grubaltefiarch}-%{tarversion}
|
||||
grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubaltefiarch}-%{tarversion}/.gitignore
|
||||
cp %{SOURCE4} grub-%{grubaltefiarch}-%{tarversion}/unifont.pcf.gz
|
||||
git add grub-%{grubaltefiarch}-%{tarversion}
|
||||
%endif
|
||||
%if 0%{with_legacy_arch}
|
||||
mkdir grub-%{grublegacyarch}-%{tarversion}
|
||||
grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grublegacyarch}-%{tarversion}/.gitignore
|
||||
|
|
@ -216,9 +207,6 @@ git commit -m "After making subdirs"
|
|||
%if 0%{with_efi_arch}
|
||||
%{expand:%do_primary_efi_build %%{grubefiarch} %%{grubefiname} %%{grubeficdname} %%{_target_platform} %%{efi_target_cflags} %%{efi_host_cflags} %{sb_ca} %{sb_cer} %{sb_key}}
|
||||
%endif
|
||||
%if 0%{with_alt_efi_arch}
|
||||
%{expand:%do_alt_efi_build %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname} %%{_alt_target_platform} %%{alt_efi_target_cflags} %%{alt_efi_host_cflags} %{sb_ca} %{sb_cer} %{sb_key}}
|
||||
%endif
|
||||
%if 0%{with_legacy_arch}
|
||||
%{expand:%do_legacy_build %%{grublegacyarch}}
|
||||
%endif
|
||||
|
|
@ -245,11 +233,8 @@ rm -fr $RPM_BUILD_ROOT
|
|||
%if 0%{with_efi_arch}
|
||||
%{expand:%do_efi_install %%{grubefiarch} %%{grubefiname} %%{grubeficdname}}
|
||||
%endif
|
||||
%if 0%{with_alt_efi_arch}
|
||||
%{expand:%do_alt_efi_install %%{grubaltefiarch} %%{grubaltefiname} %%{grubalteficdname}}
|
||||
%endif
|
||||
%if 0%{with_legacy_arch}
|
||||
%{expand:%do_legacy_install %%{grublegacyarch} %%{alt_grub_target_name} 0%{with_efi_arch}}
|
||||
%{expand:%do_legacy_install %%{grublegacyarch} 0%{with_efi_arch}}
|
||||
%endif
|
||||
%if 0%{with_emu_arch}
|
||||
%{expand:%do_emu_install %%{package_arch}}
|
||||
|
|
@ -530,9 +515,6 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
|
|||
%if 0%{with_efi_arch}
|
||||
%{expand:%define_efi_variant_files %%{package_arch} %%{grubefiname} %%{grubeficdname} %%{grubefiarch} %%{target_cpu_name} %%{grub_target_name}}
|
||||
%endif
|
||||
%if 0%{with_alt_efi_arch}
|
||||
%{expand:%define_efi_variant_files %%{alt_package_arch} %%{grubaltefiname} %%{grubalteficdname} %%{grubaltefiarch} %%{alt_target_cpu_name} %%{alt_grub_target_name}}
|
||||
%endif
|
||||
%if 0%{with_legacy_arch}
|
||||
%{expand:%define_legacy_variant_files %%{legacy_package_arch} %%{grublegacyarch}}
|
||||
%endif
|
||||
|
|
@ -548,6 +530,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Feb 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-22
|
||||
- Stop building unsupported 32-bit UEFI stuff
|
||||
- Resolves: #2038401
|
||||
|
||||
* Wed Feb 16 2022 Brian Stinson <bstinson@redhat.com> - 2.06-21
|
||||
- Require Secure Boot certs based on architecture
|
||||
- Resolves: #2049214
|
||||
|
|
|
|||
Loading…
Reference in New Issue