summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-10-31 12:47:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-24 15:30:01 +0000
commit91e62fe45e89ea4894f6e61f5a6f180a7f015248 (patch)
tree7402d03f0b45ec523aa731799ff93405c72f9670 /meta/recipes-core
parent47b7a18a5a95f7bc383d276d0dc2332dd7f1bec4 (diff)
downloadpoky-91e62fe45e89ea4894f6e61f5a6f180a7f015248.tar.gz
ovmf: correct patches status
(From OE-Core rev: 80280e06923b4adcf56d0726311da8d68f51ac57) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0f758719ad26fd7b23bbf21a37375f8de7068f0e) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch2
-rw-r--r--meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch7
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
index 89d9ffab5e..0c3df4fc44 100644
--- a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
+++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch
@@ -10,7 +10,7 @@ tools. The BBAKE_EDK_TOOLS_PATH string is used as a pattern to be replaced
10with the appropriate location before building. 10with 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: Inappropriate [oe-core cross compile specific]
14--- 14---
15 OvmfPkg/build.sh | 2 +- 15 OvmfPkg/build.sh | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/ovmf/ovmf/0002-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 f6141c8af5..2293d7e938 100644
--- a/meta/recipes-core/ovmf/ovmf/0002-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
@@ -6,8 +6,13 @@ Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake
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
9Note from Alex: this is not appropriate for upstream submission as
10the recipe already does lots of similar in-place fixups elsewhere, so
11this patch shold be converted to follow that pattern. We're not going
12to fight against how upstream wants to configure the build.
13
9Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> 14Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
10Upstream-Status: Pending 15Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups]
11--- 16---
12 BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- 17 BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++--------
13 1 file changed, 9 insertions(+), 8 deletions(-) 18 1 file changed, 9 insertions(+), 8 deletions(-)