diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-09-17 11:38:49 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-18 08:53:10 +0100 |
| commit | efddfa97a2b0ba5ec1c3f24b895097f6355ee4b4 (patch) | |
| tree | e01e0990492f5e5bbb28a9d2edb450e397bc8702 /meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | |
| parent | d8ad963a2280d7e6995734ddcb620bd10af70b34 (diff) | |
| download | poky-efddfa97a2b0ba5ec1c3f24b895097f6355ee4b4.tar.gz | |
ovmf: update edk2-stable202305 -> edk2-stable202308
(From OE-Core rev: 48878248d39d7e0bf66f33051f7ecef49c14e1e1)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch')
| -rw-r--r-- | meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 efabc8febc..eeedc9e20f 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 | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce Mon Sep 17 00:00:00 2001 | 1 | From ac9df4fb92965f1f95a5bdbde5f2f86d0c569711 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
| 3 | Date: Fri, 26 Jul 2019 17:34:26 -0400 | 3 | Date: Fri, 26 Jul 2019 17:34:26 -0400 |
| 4 | Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake | 4 | Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake |
| 5 | 5 | ||
| 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. |
| @@ -18,13 +18,13 @@ Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] | |||
| 18 | 1 file changed, 7 insertions(+), 8 deletions(-) | 18 | 1 file changed, 7 insertions(+), 8 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile | 20 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile |
| 21 | index 1bf003523b..28757aed63 100644 | 21 | index d369908a09..22c670f316 100644 |
| 22 | --- a/BaseTools/Source/C/Makefiles/header.makefile | 22 | --- a/BaseTools/Source/C/Makefiles/header.makefile |
| 23 | +++ b/BaseTools/Source/C/Makefiles/header.makefile | 23 | +++ b/BaseTools/Source/C/Makefiles/header.makefile |
| 24 | @@ -82,35 +82,34 @@ $(error Bad HOST_ARCH) | 24 | @@ -85,35 +85,34 @@ endif |
| 25 | endif | ||
| 26 | 25 | ||
| 27 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) | 26 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) |
| 27 | INCLUDE += -I $(EDK2_PATH)/MdePkg/Include | ||
| 28 | -CPPFLAGS = $(INCLUDE) | 28 | -CPPFLAGS = $(INCLUDE) |
| 29 | +CPPFLAGS += $(INCLUDE) | 29 | +CPPFLAGS += $(INCLUDE) |
| 30 | 30 | ||