The package rpms/grub2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/grub2.git/commit/?id=a91fed7f6681....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit a91fed7f66811839cd0aaed13ed86e67f8f46220
Author: Peter Jones <pjones(a)redhat.com>
Date: Thu Jan 18 14:03:23 2018 -0500
Fix some efi modules bugs
- Fix grub2-efi-modules provides/obsoletes generation
Resolves: rhbz#1506704
- *Also* build grub-efi-ia32{,-*,!-modules} packages for i686 builds
Resolves: rhbz#1502312
Signed-off-by: Peter Jones <pjones(a)redhat.com>
diff --git a/grub.macros b/grub.macros
index 69110db..972bfbb 100644
--- a/grub.macros
+++ b/grub.macros
@@ -61,15 +61,9 @@
%global platform ieee1275
%endif
-%ifarch %{ix86}
-%global target_cpu_name %{_arch}
-%global legacy_target_cpu_name i386
-%global legacy_package_arch pc
-%global platform pc
-%endif
%global efi_only aarch64 %{arm}
-%global efi_arch x86_64 ia64 %{efi_only}
+%global efi_arch x86_64 %{ix86} ia64 %{efi_only}
%ifarch %{efi_arch}
%global with_efi_arch 1
%else
@@ -96,6 +90,17 @@
%global legacy_provides -l
%endif
+%ifarch %{ix86}
+%global efiarch ia32
+%global target_cpu_name i386
+%global grub_target_name i386-efi
+%global package_arch efi-ia32
+
+%global legacy_target_cpu_name i386
+%global legacy_package_arch pc
+%global platform pc
+%endif
+
%ifarch x86_64
%global efiarch x64
%global target_cpu_name %{_arch}
@@ -140,6 +145,13 @@
%global grubefiname grub%{efiarch}.efi
%global grubeficdname gcd%{efiarch}.efi
%global grubefiarch %{target_cpu_name}-efi
+%ifarch %{ix86}
+%global with_efi_modules 0
+%global without_efi_modules 1
+%else
+%global with_efi_modules 1
+%global without_efi_modules 0
+%endif
%endif
%if 0%{?alt_efi_arch:1}
@@ -233,16 +245,18 @@ Provides: %{name}-efi = %{evr} \
This subpackage provides support for %{1} systems. \
\
%{expand:%%{?!buildsubdir:%%define buildsubdir grub-%{1}-%{tarversion}}}\
+%{expand:%if 0%{?with_efi_modules} \
%{expand:%%package %{1}-modules} \
Summary: Modules used to build custom grub.efi images \
Group: System Environment/Base \
BuildArch: noarch \
Requires: %{name}-common = %{evr} \
-%{-p:Provides: %{name}-efi-modules = %{evr}} \
-%{-p:Obsoletes: %{name}-efi-modules < %{evr}} \
+Provides: %{name}-efi-modules = %{evr} \
+Obsoletes: %{name}-efi-modules < %{evr} \
%{expand:%%description %{1}-modules} \
%{desc} \
This subpackage provides support for rebuilding your own grub.efi. \
+%endif} \
\
%{expand:%%package %{1}-cdboot} \
Summary: Files used to boot removeable media with EFI \
@@ -480,12 +494,18 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grub.cfg \
/boot/grub2/grubenv \
%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv \
+%{expand:%if 0%{?without_efi_modules} \
+%exclude %{_libdir}/grub/%{6} \
+%exclude %{_libdir}/grub/%{6}/* \
+%endif} \
\
+%{expand:%if 0%{?with_efi_modules} \
%{expand:%%files %{1}-modules} \
%defattr(-,root,root,-) \
%dir %{_libdir}/grub/%{6}/ \
%{_libdir}/grub/%{6}/* \
%exclude %{_libdir}/grub/%{6}/*.module \
+%endif} \
\
%{expand:%%files %{1}-cdboot} \
%defattr(-,root,root,-) \
diff --git a/grub2.spec b/grub2.spec
index 0232729..9417f0b 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
Name: grub2
Epoch: 1
Version: 2.02
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
License: GPLv3+
@@ -454,7 +454,11 @@ fi
%endif
%changelog
-* Thu Jan 18 2018 Peter Jones <pjones(a)redhat.com> - 2.02-20
+* Thu Jan 18 2018 Peter Jones <pjones(a)redhat.com> - 2.02-21
+- Fix grub2-efi-modules provides/obsoletes generation
+ Resolves: rhbz#1506704
+- *Also* build grub-efi-ia32{,-*,!-modules} packages for i686 builds
+ Resolves: rhbz#1502312
- Make everything under /boot/efi be mode 0700, since that's what FAT will
show anyway.
commit 8cceee7ebee92ec01ba738c0bd88bbf5864a321d
Author: Peter Jones <pjones(a)redhat.com>
Date: Thu Jan 18 14:12:52 2018 -0500
Make everything under /boot/efi be mode 0700, since that's what FAT will
show anyway.
Signed-off-by: Peter Jones <pjones(a)redhat.com>
diff --git a/grub.macros b/grub.macros
index 44c6886..69110db 100644
--- a/grub.macros
+++ b/grub.macros
@@ -474,10 +474,10 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%{expand:%%files %{1}} \
%defattr(-,root,root,-) \
%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg \
-%dir %attr(0755,root,root)/boot/efi/EFI/%{efidir} \
-/boot/efi/EFI/%{efidir}/%{2} \
+%dir %attr(0700,root,root)/boot/efi/EFI/%{efidir} \
+%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{2} \
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \
-%ghost %config(noreplace) /boot/efi/EFI/%{efidir}/grub.cfg \
+%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grub.cfg \
/boot/grub2/grubenv \
%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv \
\
@@ -489,6 +489,6 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
\
%{expand:%%files %{1}-cdboot} \
%defattr(-,root,root,-) \
-%attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{3} \
-%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \
+%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{3} \
+%attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \
%{nil}
diff --git a/grub2.spec b/grub2.spec
index 35d34da..0232729 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -314,7 +314,7 @@ fi
%exclude /boot/%{name}/themes/system/*
%attr(0700,root,root) %dir /boot/grub2
%exclude /boot/grub2/*
-%dir %attr(0755,root,root) /boot/efi/EFI/%{efidir}
+%dir %attr(0700,root,root) /boot/efi/EFI/%{efidir}
%exclude /boot/efi/EFI/%{efidir}/*
%license COPYING
%ghost %config(noreplace) /boot/grub2/grubenv
@@ -454,6 +454,10 @@ fi
%endif
%changelog
+* Thu Jan 18 2018 Peter Jones <pjones(a)redhat.com> - 2.02-20
+- Make everything under /boot/efi be mode 0700, since that's what FAT will
+ show anyway.
+
* Wed Jan 17 2018 Peter Jones <pjones(a)redhat.com> - 2.02-20
- Update to newer upstream for F28
- Pull in patches for Apollo Lake hardware