summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch10
-rw-r--r--meta/recipes-core/ovmf/ovmf_git.bb4
2 files changed, 7 insertions, 7 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 @@
1From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce Mon Sep 17 00:00:00 2001 1From ac9df4fb92965f1f95a5bdbde5f2f86d0c569711 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 2/4] BaseTools: makefile: adjust to build in under bitbake 4Subject: [PATCH] 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.
@@ -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
20diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile 20diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
21index 1bf003523b..28757aed63 100644 21index 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
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index 761c265453..6bbe21ac5c 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -26,8 +26,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
26 file://0004-reproducible.patch \ 26 file://0004-reproducible.patch \
27 " 27 "
28 28
29PV = "edk2-stable202305" 29PV = "edk2-stable202308"
30SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" 30SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e"
31UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" 31UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
32 32
33inherit deploy 33inherit deploy