summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-18 18:30:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:22 +0000
commitfd61f30c2a723e497edc33902998d7b464e1efaf (patch)
tree98462953189d63607e0c6d65ff6eaa18be66246f
parente9e708f923b69709a010c4d8c18ba172168a9432 (diff)
downloadpoky-fd61f30c2a723e497edc33902998d7b464e1efaf.tar.gz
ovmf: update to 201911
Remove unused patch. (From OE-Core rev: 159328dde56e35ba56ec0b1e3602a3b2df6ad691) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch (renamed from meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch)11
-rw-r--r--meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch (renamed from meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch)17
-rw-r--r--meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch (renamed from meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch)18
-rw-r--r--meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch (renamed from meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch)26
-rw-r--r--meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch33
-rw-r--r--meta/recipes-core/ovmf/ovmf_git.bb12
6 files changed, 54 insertions, 63 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
index 94ae5d4496..6ecb23b29f 100644
--- a/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
+++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
@@ -1,7 +1,7 @@
1From 9e632e3f9edd09632cc877dff6ea57608f979aab Mon Sep 17 00:00:00 2001 1From 0a8362cfb9f00870d70687475665b131dd82c947 Mon Sep 17 00:00:00 2001
2From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> 2From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
3Date: Thu, 9 Jun 2016 02:23:01 -0700 3Date: Thu, 9 Jun 2016 02:23:01 -0700
4Subject: [PATCH] ovmf: update path to native BaseTools 4Subject: [PATCH 1/5] ovmf: update path to native BaseTools
5 5
6BaseTools is a set of utilities to build EDK-based firmware. These utilities 6BaseTools is a set of utilities to build EDK-based firmware. These utilities
7are used during the build process. Thus, they need to be built natively. 7are used during the build process. Thus, they need to be built natively.
@@ -11,15 +11,16 @@ with the appropriate location before building.
11 11
12Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> 12Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
13Upstream-Status: Pending 13Upstream-Status: Pending
14
14--- 15---
15 OvmfPkg/build.sh | 2 +- 16 OvmfPkg/build.sh | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
17 18
18diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh 19diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
19index eb5eb73..9058fca 100755 20index 91b1442ade..1858dae31a 100755
20--- a/OvmfPkg/build.sh 21--- a/OvmfPkg/build.sh
21+++ b/OvmfPkg/build.sh 22+++ b/OvmfPkg/build.sh
22@@ -30,7 +30,7 @@ then 23@@ -24,7 +24,7 @@ then
23 # this assumes svn pulls have the same root dir 24 # this assumes svn pulls have the same root dir
24 # export EDK_TOOLS_PATH=`pwd`/../BaseTools 25 # export EDK_TOOLS_PATH=`pwd`/../BaseTools
25 # This version is for the tools source in edk2 26 # This version is for the tools source in edk2
@@ -29,5 +30,5 @@ index eb5eb73..9058fca 100755
29 source edksetup.sh BaseTools 30 source edksetup.sh BaseTools
30 else 31 else
31-- 32--
322.8.1 332.17.1
33 34
diff --git a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
index 070b0ac5a6..f37ed018ab 100644
--- a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
+++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
@@ -1,25 +1,26 @@
1From 2320650c6d381b914fe91b2dedaa5870279a8bcf Mon Sep 17 00:00:00 2001 1From a8bceaec1b16fffbf6810df05503d8ae9092b735 Mon Sep 17 00:00:00 2001
2From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> 2From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
3Date: Fri, 26 Jul 2019 17:34:26 -0400 3Date: Fri, 26 Jul 2019 17:34:26 -0400
4Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake 4Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake
5 5
6Prepend the build flags with those of bitbake. This is to build 6Prepend the build flags with those of bitbake. This is to build
7using the bitbake native sysroot include and library directories. 7using the bitbake native sysroot include and library directories.
8 8
9Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> 9Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
10Upstream-Status: Pending 10Upstream-Status: Pending
11
11--- 12---
12 BaseTools/Source/C/Makefiles/header.makefile | 10 +++++----- 13 BaseTools/Source/C/Makefiles/header.makefile | 10 +++++-----
13 1 file changed, 5 insertions(+), 5 deletions(-) 14 1 file changed, 5 insertions(+), 5 deletions(-)
14 15
15Index: git/BaseTools/Source/C/Makefiles/header.makefile 16diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
16=================================================================== 17index 4e9b36d98b..eb03ee33fa 100644
17--- git.orig/BaseTools/Source/C/Makefiles/header.makefile 18--- a/BaseTools/Source/C/Makefiles/header.makefile
18+++ git/BaseTools/Source/C/Makefiles/header.makefile 19+++ b/BaseTools/Source/C/Makefiles/header.makefile
19@@ -62,23 +62,23 @@ $(error Bad HOST_ARCH) 20@@ -62,23 +62,23 @@ $(error Bad HOST_ARCH)
20 endif 21 endif
21 22
22 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) 23 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
23-BUILD_CPPFLAGS = $(INCLUDE) 24-BUILD_CPPFLAGS = $(INCLUDE)
24+BUILD_CPPFLAGS += $(INCLUDE) 25+BUILD_CPPFLAGS += $(INCLUDE)
25 26
@@ -46,5 +47,5 @@ Index: git/BaseTools/Source/C/Makefiles/header.makefile
46 ifeq ($(HOST_ARCH), IA32) 47 ifeq ($(HOST_ARCH), IA32)
47 # 48 #
48-- 49--
492.20.1 502.17.1
50 51
diff --git a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch b/meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch
index d954fbe314..ab1e7db31f 100644
--- a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch
+++ b/meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch
@@ -1,18 +1,28 @@
1From 032fc6b1f7691bd537fd2a6bd13821fcf3c45e64 Mon Sep 17 00:00:00 2001 1From 60a5f953f747e1e9e05a40157b651cba8ea57b91 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Mon, 11 Sep 2017 02:21:55 -0400 3Date: Mon, 11 Sep 2017 02:21:55 -0400
4Subject: [PATCH] ovmf: enable long path file 4Subject: [PATCH 3/5] ovmf: enable long path file
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Dengke Du <dengke.du@windriver.com> 7Signed-off-by: Dengke Du <dengke.du@windriver.com>
8
8--- 9---
9 BaseTools/Source/C/Common/CommonLib.h | 2 +- 10 BaseTools/Source/C/Common/CommonLib.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
11 12
12diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h 13diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h
13index 2041b89e2d..8116aa2e35 100644 14index e1cce985f7..d67d03c70c 100644
14--- a/BaseTools/Source/C/Common/CommonLib.h 15--- a/BaseTools/Source/C/Common/CommonLib.h
15+++ b/BaseTools/Source/C/Common/CommonLib.h 16+++ b/BaseTools/Source/C/Common/CommonLib.h
16@@ -22 +22 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 17@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
18 #include <assert.h>
19 #define PRINTED_GUID_BUFFER_SIZE 37 // including null-termination
20
17-#define MAX_LONG_FILE_PATH 500 21-#define MAX_LONG_FILE_PATH 500
18+#define MAX_LONG_FILE_PATH 1023 22+#define MAX_LONG_FILE_PATH 1023
23
24 #define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL)
25 #define MAX_UINT32 ((UINT32)0xFFFFFFFF)
26--
272.17.1
28
diff --git a/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch b/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
index 1b65348e84..c10a39d95d 100644
--- a/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch
+++ b/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
@@ -1,15 +1,24 @@
1Author: Steve Langasek <steve.langasek@ubuntu.com> 1From 94eff316b31b4d0348af28c77be5c00bc09fe8e7 Mon Sep 17 00:00:00 2001
2From: Steve Langasek <steve.langasek@ubuntu.com>
3Date: Sat, 10 Jun 2017 01:39:36 -0700
4Subject: [PATCH 4/5] ovmf: Update to latest
5
2Description: pass -fno-stack-protector to all GCC toolchains 6Description: pass -fno-stack-protector to all GCC toolchains
3 The upstream build rules inexplicably pass -fno-stack-protector only 7 The upstream build rules inexplicably pass -fno-stack-protector only
4 when building for i386 and amd64. Add this essential argument to the 8 when building for i386 and amd64. Add this essential argument to the
5 generic rules for gcc 4.4 and later. 9 generic rules for gcc 4.4 and later.
6Last-Updated: 2016-04-12 10Last-Updated: 2016-04-12
7Upstream-Status: Pending 11Upstream-Status: Pending
8Index: git/BaseTools/Conf/tools_def.template 12
9=================================================================== 13---
10--- git.orig/BaseTools/Conf/tools_def.template 14 BaseTools/Conf/tools_def.template | 8 ++++----
11+++ git/BaseTools/Conf/tools_def.template 15 1 file changed, 4 insertions(+), 4 deletions(-)
12@@ -1736,10 +1736,10 @@ DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386 16
17diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
18index ca0b122dbb..b0066c2ab8 100755
19--- a/BaseTools/Conf/tools_def.template
20+++ b/BaseTools/Conf/tools_def.template
21@@ -1941,10 +1941,10 @@ DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386
13 DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii 22 DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii
14 DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii 23 DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
15 24
@@ -23,7 +32,7 @@ Index: git/BaseTools/Conf/tools_def.template
23 DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable 32 DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
24 DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive 33 DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
25 DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON) 34 DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON)
26@@ -1748,7 +1748,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF 35@@ -1953,7 +1953,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
27 DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS) 36 DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS)
28 DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian 37 DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
29 DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian 38 DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
@@ -32,3 +41,6 @@ Index: git/BaseTools/Conf/tools_def.template
32 DEFINE GCC48_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS) 41 DEFINE GCC48_ARM_CC_XIPFLAGS = DEF(GCC_ARM_CC_XIPFLAGS)
33 DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS) 42 DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS)
34 DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS) 43 DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS)
44--
452.17.1
46
diff --git a/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch b/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
deleted file mode 100644
index bb12d8beba..0000000000
--- a/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From c7722d10c7bcf6be0adcf54abb1d406599dd7914 Mon Sep 17 00:00:00 2001
2From: Patrick Ohly <patrick.ohly@intel.com>
3Date: Fri, 24 Feb 2017 01:40:02 +0100
4Subject: [PATCH] VfrCompile: increase path length limit
5
6The VfrCompile tool has a hard-coded maximum length for path names
7which turned out to be too small by around 20 characters in the Yocto
8autobuilder setup. Increasing the maximum by a factor of 4 is
9relatively easy and makes the problem less likely.
10
11Upstream-Status: Inappropriate [configuration]
12
13Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
14---
15 BaseTools/Source/C/VfrCompile/EfiVfr.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/BaseTools/Source/C/VfrCompile/EfiVfr.h b/BaseTools/Source/C/VfrCompile/EfiVfr.h
19index d187902..9ad4a7b 100644
20--- a/BaseTools/Source/C/VfrCompile/EfiVfr.h
21+++ b/BaseTools/Source/C/VfrCompile/EfiVfr.h
22@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
23 #include "Common/UefiInternalFormRepresentation.h"
24 #include "Common/MdeModuleHii.h"
25
26-#define MAX_PATH 255
27+#define MAX_PATH 1023
28 #define MAX_VFR_LINE_LEN 4096
29
30 #define EFI_IFR_MAX_LENGTH 0xFF
31--
322.1.4
33
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index ff2b2a530a..9667fa0c86 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -13,14 +13,14 @@ PACKAGECONFIG ??= ""
13PACKAGECONFIG[secureboot] = ",,," 13PACKAGECONFIG[secureboot] = ",,,"
14 14
15SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=git \ 15SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=git \
16 file://0002-ovmf-update-path-to-native-BaseTools.patch \ 16 file://0001-ovmf-update-path-to-native-BaseTools.patch \
17 file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ 17 file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
18 file://0004-ovmf-enable-long-path-file.patch \ 18 file://0003-ovmf-enable-long-path-file.patch \
19 file://no-stack-protector-all-archs.patch \ 19 file://0004-ovmf-Update-to-latest.patch \
20 " 20 "
21 21
22PV = "edk2-stable201905" 22PV = "edk2-stable201911"
23SRCREV="20d2e5a125e34fc8501026613a71549b2a1a3e54" 23SRCREV = "bd85bf54c268204c7a698a96f3ccd96cd77952cd"
24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" 24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
25 25
26inherit deploy 26inherit deploy