diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-31 12:47:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-24 15:30:06 +0000 |
| commit | be2850d104f9564224870db15a0dd83181e75b81 (patch) | |
| tree | fa25773d02d6b32a4d7cdcc2b72e192add6969cc | |
| parent | ac079fb88b34c147f147ad173cc6f5eb01829c15 (diff) | |
| download | poky-be2850d104f9564224870db15a0dd83181e75b81.tar.gz | |
ovmf: correct patches status
(From OE-Core rev: 91371976a71a2433597dd1921ff17212c1fe93ce)
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>
| -rw-r--r-- | meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | 7 |
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 | |||
| 10 | with the appropriate location before building. | 10 | with the appropriate location before building. |
| 11 | 11 | ||
| 12 | Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 12 | Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
| 13 | Upstream-Status: Pending | 13 | Upstream-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 | |||
| 6 | Prepend the build flags with those of bitbake. This is to build | 6 | Prepend the build flags with those of bitbake. This is to build |
| 7 | using the bitbake native sysroot include and library directories. | 7 | using the bitbake native sysroot include and library directories. |
| 8 | 8 | ||
| 9 | Note from Alex: this is not appropriate for upstream submission as | ||
| 10 | the recipe already does lots of similar in-place fixups elsewhere, so | ||
| 11 | this patch shold be converted to follow that pattern. We're not going | ||
| 12 | to fight against how upstream wants to configure the build. | ||
| 13 | |||
| 9 | Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> | 14 | Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> |
| 10 | Upstream-Status: Pending | 15 | Upstream-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(-) |
