From e0e632f9f719672534ab9cabed095ee186fed653 Mon Sep 17 00:00:00 2001 From: xiaoweiwei Date: Tue, 3 Mar 2020 15:21:15 +0800 Subject: [PATCH] generate ovmf package in arm architecture --- edk2.spec | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/edk2.spec b/edk2.spec index 30d808a..309fea6 100644 --- a/edk2.spec +++ b/edk2.spec @@ -3,20 +3,20 @@ %global openssl_version 1.1.1d %global _python_bytecompile_extra 0 -Name: edk2 -Version: %{stable_date} -Release: 6 -Summary: EFI Development Kit II -License: BSD-2-Clause-Patent -URL: https://github.com/tianocore/edk2 -Source0: edk2-%{release_tag}.tar.gz -Source1: openssl-%{openssl_version}.tar.gz -Patch1: 0001-CryptoPkg-OpensslLib-Update-process_files.pl-to-gene.patch -Patch2: 0002-CryptoPkg-Upgrade-OpenSSL-to-1.1.1d.patch -Patch3: 0003-CryptoPkg-OpensslLib-improve-INF-file-consistency.patch -Patch4: 0004-CryptoPkg-OpensslLib.inf-list-OpenSSL-local-header-m.patch -# This patch is an openssl upstream patch to fix build error -Patch5: 0005-crypto-threads_none.c-fix-syntax-error-in-openssl_ge.patch +Name: edk2 +Version: %{stable_date} +Release: 7 +Summary: EFI Development Kit II +License: BSD-2-Clause-Patent +URL: https://github.com/tianocore/edk2 +Source0: edk2-%{release_tag}.tar.gz +Source1: openssl-%{openssl_version}.tar.gz + +Patch0001: 0001-CryptoPkg-OpensslLib-Update-process_files.pl-to-gene.patch +Patch0002: 0002-CryptoPkg-Upgrade-OpenSSL-to-1.1.1d.patch +Patch0003: 0003-CryptoPkg-OpensslLib-improve-INF-file-consistency.patch +Patch0004: 0004-CryptoPkg-OpensslLib.inf-list-OpenSSL-local-header-m.patch +Patch0005: 0005-crypto-threads_none.c-fix-syntax-error-in-openssl_ge.patch BuildRequires: acpica-tools gcc gcc-c++ libuuid-devel python3 bc nasm python2 @@ -49,13 +49,11 @@ BuildArch: noarch EFI Development Kit II AARCH64 UEFI Firmware %endif -%ifarch x86_64 %package ovmf Summary: Open Virtual Machine Firmware BuildArch: noarch %description ovmf EFI Development Kit II Open Virtual Machine Firmware (x64) -%endif %ifarch %{ix86} %package ovmf-ia32 @@ -133,10 +131,8 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys dd of="%{buildroot}/usr/share/%{name}/aarch64/vars-template-pflash.raw" if="/dev/zero" bs=1M count=64 %endif -%ifarch x86_64 mkdir -p %{buildroot}/usr/share/%{name}/ovmf cp Build/OvmfX64/*/FV/OVMF_*.fd %{buildroot}/usr/share/%{name}/ovmf -%endif %ifarch %{ix86} mkdir -p %{buildroot}/usr/share/%{name}/ovmf-ia32 @@ -194,13 +190,11 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys /usr/share/%{name}/aarch64/*.raw %endif -%ifarch x86_64 %files ovmf %license OvmfPkg/License.txt %license LICENSE.openssl %dir %{_datadir}/%{name} %{_datadir}/%{name}/ovmf -%endif %ifarch %{ix86} %license OvmfPkg/License.txt @@ -210,6 +204,9 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys %endif %changelog +* Tue Mar 3 2020 openEuler Buildteam - 201908-7 +- generate ovmf package in arm architecture + * Sat Feb 22 2020 openEuler Buildteam - 201908-6 - add build requires of python2 -- Gitee