summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch
diff options
context:
space:
mode:
authorRicardo Neri <ricardo.neri-calderon@linux.intel.com>2019-07-29 19:59:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-12 16:23:57 +0100
commitbc59000e77b08d50d5dca3f38f8e52c9b6796304 (patch)
treef112b334077ea81ba20b6c2b295dbbff4891c613 /meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch
parentb2dd0b1c7c75522f9bef63160d921585c2e4300b (diff)
downloadpoky-bc59000e77b08d50d5dca3f38f8e52c9b6796304.tar.gz
ovmf: Update to version edk2-stable201905
Fixes [YOCTO #13438] Update OVMF to edk2-stable201905. Since the last update, several things have changed. Many of the patches we were carrying have now been taken upstream in EDK2 or become obsolete. See below for details. Also, as of commit 0c1ffb9504c3("CryptoPkg: Adding OpenSSL as one submodule of EDKII repo"), openssl is not embedded into EDK2 using a patching script but a git submodule. Then, use the gitsm bitbabke fetcher and drop the extra SRC_URI from openssl when building with secureboot enabled. Also remove all related variables. OVMF switched to BSD+Patent license as detailed in https://bugzilla.tianocore.org/show_bug.cgi?id=1373. Hence, update LIC_FILES_CHKSUM accordingly to reflect this change. Patches are updated as follows: Drop 0001-ia32-Dont-use-pie.patch as it is implemented in upstream EDK2 in commits are 11d0cd23dd1b ("BaseTools/tools_def IA32: drop -no-pie linker option for GCC49" and c25d3905523a ("BaseTools/tools_def IA32: disable PIE code generation explicitly") for the applicable GCC versions. Rebase 0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch to edk2-stable201905. Drop VfrCompile-increase-path-length-limit.patch as it has been taken upstream in EDK2 in commit ba78032bc8c9f("BaseTools/VfrCompile: Remove the MAX_PATH limitation"). Rebase no-stack-protector-all-archs.patch to keep behavior on not using stack protector on all archs. Drop 0001-BaseTools-header.makefile-add-Wno-stringop-truncatio.patch, 0002-BaseTools-header.makefile-add-Wno-restrict.patch, and 0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch. These patches have been taken in upstream EDK2 in commits 9222154ae7b3("BaseTools /header.makefile: add "-Wno-restrict"), 1d212a83df0e("BaseTools/ header.makefile: add "-Wno-stringop-truncation"), and 777f4aa083e9 ("BaseTools/header.makefile: revert gcc-8 '-Wno-xxx' options on OSX"), respectively. Also, drop 0004-BaseTools-GenVtf-silence-false-stringop-overflow-war.patch. GenVtf has been removed from EDK2 in commit 64ab2c82e8f6("BaseTools: Remove GenVtf"). Also, this patch had been taken in EDK2 upstream in commit 9de306701312("BaseTools/GenVtf: silence false 'stringop-overflow' warning with memcpy()"). Drop patch 0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch as it also has been taken by EDK2. Patches 0002-ovmf-update-path-to-native-BaseTools.patch and 0004-ovmf-enable-long-path-file.patch did not need any update. Lastly, add a needed dependency on bc. Cc: Ross Burton <ross.burton@intel.com> Cc: Patrick Ohly <patrick.ohly@intel.com> (From OE-Core rev: 1f64ecf92fa77b682b18efe72fb6b27ff64ee052) Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch')
-rw-r--r--meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch b/meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch
deleted file mode 100644
index 920723e326..0000000000
--- a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 6866325dd9c17412e555974dde41f9631224db52 Mon Sep 17 00:00:00 2001
2From: Laszlo Ersek <lersek@redhat.com>
3Date: Wed, 7 Mar 2018 10:17:28 +0100
4Subject: [PATCH 3/4] BaseTools/header.makefile: revert gcc-8 "-Wno-xxx"
5 options on OSX
6
7I recently added the gcc-8 specific "-Wno-stringop-truncation" and
8"-Wno-restrict" options to BUILD_CFLAGS, both for "Darwin" (XCODE5 /
9clang, OSX) and otherwise (gcc, Linux / Cygwin).
10
11I also regression-tested the change with gcc-4.8 on Linux -- gcc-4.8 does
12not know either of the (gcc-8 specific) "-Wno-stringop-truncation" and
13"-Wno-restrict" options, yet the build completed fine (by GCC design).
14
15Regarding OSX, my expectation was that
16
17- XCODE5 / clang would either recognize these warnings options (because
18 clang does recognize most -W options of gcc),
19
20- or, similarly to gcc, clang would simply ignore the "-Wno-xxx" flags
21 that it didn't recognize.
22
23Neither is the case; the new flags have broken the BaseTools build on OSX.
24Revert them (for OSX only).
25
26Cc: Liming Gao <liming.gao@intel.com>
27Cc: Yonghong Zhu <yonghong.zhu@intel.com>
28Reported-by: Liming Gao <liming.gao@intel.com>
29Fixes: 1d212a83df0eaf32a6f5d4159beb2d77832e0231
30Fixes: 9222154ae7b3eef75ae88cdb56158256227cb929
31Contributed-under: TianoCore Contribution Agreement 1.1
32Signed-off-by: Laszlo Ersek <lersek@redhat.com>
33Reviewed-by: Liming Gao <liming.gao@intel.com>
34Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
35---
36Signed-off-by: Khem Raj <raj.khem@gmail.com>
37Upstream-Status: Backport
38 BaseTools/Source/C/Makefiles/header.makefile | 2 +-
39 1 file changed, 1 insertion(+), 1 deletion(-)
40
41Index: git/BaseTools/Source/C/Makefiles/header.makefile
42===================================================================
43--- git.orig/BaseTools/Source/C/Makefiles/header.makefile
44+++ git/BaseTools/Source/C/Makefiles/header.makefile
45@@ -47,7 +47,7 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT)
46 BUILD_CPPFLAGS += $(INCLUDE) -O2
47 ifeq ($(DARWIN),Darwin)
48 # assume clang or clang compatible flags on OS X
49-BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-self-assign -Wno-unused-result -nostdlib -c -g
50+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
51 else
52 BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g
53 endif