From 7195ac465d88583669a5237af4dd6f38ed62e586 Mon Sep 17 00:00:00 2001 From: zhanghailiang Date: Tue, 17 Mar 2020 10:19:59 +0800 Subject: [PATCH 1/3] spec: enable multiple threads compiling Signed-off-by: zhanghailiang --- edk2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/edk2.spec b/edk2.spec index ae6aa9a..e4b2b0a 100644 --- a/edk2.spec +++ b/edk2.spec @@ -5,7 +5,7 @@ Name: edk2 Version: %{stable_date} -Release: 7 +Release: 8 Summary: EFI Development Kit II License: BSD-2-Clause-Patent URL: https://github.com/tianocore/edk2 @@ -74,7 +74,7 @@ tar -xf %{SOURCE1} -C CryptoPkg/Library/OpensslLib/openssl --strip-components=1 NCPUS=`/usr/bin/getconf _NPROCESSORS_ONLN` BUILD_OPTION="-t GCC49 -n $NCPUS -b RELEASE" -make -C BaseTools +make -C BaseTools %{?_smp_mflags} . ./edksetup.sh %ifarch aarch64 @@ -210,6 +210,9 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys %endif %changelog +* Tue Mar 17 2020 openEuler Buildteam - 201908-8 +- enable multiple threads compiling + * Sun Mar 15 2020 openEuler Buildteam - 201908-7 - fix missing OVMF.fd in package -- Gitee From 62f3b1f4fed8e5c3466752e7ffa3cdd4f6944dda Mon Sep 17 00:00:00 2001 From: zhanghailiang Date: Tue, 17 Mar 2020 10:12:12 +0800 Subject: [PATCH 2/3] spec: pass some options to make command edk2 packages can take EXTRA_OPTFLAGS and EXTRA_LDFLAGS from caller, we pass the default optflags and __global_ldflags to make. Signed-off-by: zhanghailiang --- edk2.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/edk2.spec b/edk2.spec index e4b2b0a..5bffa2a 100644 --- a/edk2.spec +++ b/edk2.spec @@ -74,7 +74,7 @@ tar -xf %{SOURCE1} -C CryptoPkg/Library/OpensslLib/openssl --strip-components=1 NCPUS=`/usr/bin/getconf _NPROCESSORS_ONLN` BUILD_OPTION="-t GCC49 -n $NCPUS -b RELEASE" -make -C BaseTools %{?_smp_mflags} +make -C BaseTools %{?_smp_mflags} EXTRA_OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{__global_ldflags}" . ./edksetup.sh %ifarch aarch64 @@ -212,6 +212,7 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys %changelog * Tue Mar 17 2020 openEuler Buildteam - 201908-8 - enable multiple threads compiling +- Pass EXTRA_OPTFLAGS and EXTRA_OPTFLAGS options to make command * Sun Mar 15 2020 openEuler Buildteam - 201908-7 - fix missing OVMF.fd in package -- Gitee From cb50babe8789828e1a420426bec803d96b15964b Mon Sep 17 00:00:00 2001 From: zhanghailiang Date: Tue, 17 Mar 2020 10:31:54 +0800 Subject: [PATCH 3/3] spec: enable ipv6 for x86_64 Signed-off-by: zhanghailiang --- edk2.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/edk2.spec b/edk2.spec index 5bffa2a..c3c6458 100644 --- a/edk2.spec +++ b/edk2.spec @@ -77,12 +77,13 @@ BUILD_OPTION="-t GCC49 -n $NCPUS -b RELEASE" make -C BaseTools %{?_smp_mflags} EXTRA_OPTFLAGS="%{optflags}" EXTRA_LDFLAGS="%{__global_ldflags}" . ./edksetup.sh +COMMON_FLAGS="-D NETWORK_IP6_ENABLE" %ifarch aarch64 - BUILD_OPTION="$BUILD_OPTION -a AARCH64 -p ArmVirtPkg/ArmVirtQemu.dsc --cmd-len=65536 -D NETWORK_IP6_ENABLE" + BUILD_OPTION="$BUILD_OPTION -a AARCH64 -p ArmVirtPkg/ArmVirtQemu.dsc --cmd-len=65536 $COMMON_FLAGS" %endif %ifarch x86_64 - BUILD_OPTION="$BUILD_OPTION -a X64 -p OvmfPkg/OvmfPkgX64.dsc" + BUILD_OPTION="$BUILD_OPTION -a X64 -p OvmfPkg/OvmfPkgX64.dsc $COMMON_FLAGS" %endif %ifarch %{ix86} @@ -213,6 +214,7 @@ chmod +x %{buildroot}%{_bindir}/Rsa2048Sha256GenerateKeys * Tue Mar 17 2020 openEuler Buildteam - 201908-8 - enable multiple threads compiling - Pass EXTRA_OPTFLAGS and EXTRA_OPTFLAGS options to make command +- enable IPv6 for X86_64 * Sun Mar 15 2020 openEuler Buildteam - 201908-7 - fix missing OVMF.fd in package -- Gitee