rpms/shim
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bootloader path and whitelist certificates on ARM Aarch64.

Browse Source 
Resolves: rhbz#1170289

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2014-12-03 12:33:38 -05:00
parent 2d3b876a4b
commit 1ecf8fe756
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*.tar.* *.tar.*
clog clog
*.rpm *.rpm
/rhtest.cer

24
shim.spec
View File

@ -1,6 +1,6 @@
Name: shim Name: shim
Version: 0.8 Version: 0.8
Release: 1 Release: 2%{?dist}
Summary: First-stage UEFI bootloader Summary: First-stage UEFI bootloader
License: BSD License: BSD
@ -17,6 +17,7 @@ Source1: fedora-ca.cer
# gcdx64.efi 99fcaa957786c155a92b40be9c981c4e4685b8c62b408cb0f6cb2df9c30b9978 # gcdx64.efi 99fcaa957786c155a92b40be9c981c4e4685b8c62b408cb0f6cb2df9c30b9978
# woops. # woops.
Source2: dbx.esl Source2: dbx.esl
Source4: rhtest.cer
BuildRequires: git openssl-devel openssl BuildRequires: git openssl-devel openssl
BuildRequires: pesign >= 0.106-1 BuildRequires: pesign >= 0.106-1
@ -34,6 +35,13 @@ Provides: bundled(openssl) = 0.9.8zb
# Adding further platforms will require adding appropriate relocation code. # Adding further platforms will require adding appropriate relocation code.
ExclusiveArch: x86_64 aarch64 ExclusiveArch: x86_64 aarch64
%ifarch x86_64
%global efiarch x64
%endif
%ifarch aarch64
%global efiarch aa64
%endif
# Figure out the right file path to use # Figure out the right file path to use
%if 0%{?rhel} %if 0%{?rhel}
%global efidir redhat %global efidir redhat
@ -60,16 +68,22 @@ git config user.email "%{name}-owner@fedoraproject.org"
git config user.name "Fedora Ninjas" git config user.name "Fedora Ninjas"
git add . git add .
git commit -a -q -m "%{version} baseline." git commit -a -q -m "%{version} baseline."
git am %{patches} </dev/null git am --ignore-whitespace %{patches} </dev/null
git config --unset user.email git config --unset user.email
git config --unset user.name git config --unset user.name
%build %build
MAKEFLAGS="" MAKEFLAGS=""
%ifarch aarch64
if [ -f "%{SOURCE4}" ]; then
MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE4} VENDOR_DBX_FILE=%{SOURCE2}"
fi
%else
if [ -f "%{SOURCE1}" ]; then if [ -f "%{SOURCE1}" ]; then
MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE1} VENDOR_DBX_FILE=%{SOURCE2}" MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE1} VENDOR_DBX_FILE=%{SOURCE2}"
fi fi
make 'DEFAULT_LOADER=\\\\grubx64.efi' ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi %endif
make 'DEFAULT_LOADER=\\\\grub%{efiarch}.efi' ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -91,6 +105,10 @@ install -m 0644 MokManager.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/s
%{_datadir}/shim/* %{_datadir}/shim/*
%changelog %changelog
* Wed Dec 03 2014 Peter Jones <pjones@redhat.com> - 0.8-2
- Fix bootloader path and whitelist certificates on ARM Aarch64.
Resolves: rhbz#1170289
* Tue Oct 14 2014 Peter Jones <pjones@redhat.com> - 0.8-1 * Tue Oct 14 2014 Peter Jones <pjones@redhat.com> - 0.8-1
- Update to 0.8 - Update to 0.8
Related: rhbz#1148230 Related: rhbz#1148230

1
sources
View File

@ -1 +1,2 @@
af9b5f559d1f9e370ad119c244d0f563 shim-0.8.tar.bz2 af9b5f559d1f9e370ad119c244d0f563 shim-0.8.tar.bz2
79d671bc59eb0bb5f0a7997db8f9ec98 rhtest.cer