From: Alexander Kanavin Date: Sun, 17 Sep 2023 09:38:49 +0000 (+0200) Subject: ovmf: update edk2-stable202305 -> edk2-stable202308 X-Git-Tag: yocto-4.3~313 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48878248d39d7e0bf66f33051f7ecef49c14e1e1;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git ovmf: update edk2-stable202305 -> edk2-stable202308 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- 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 efabc8febc9..eeedc9e20f0 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 @@ -From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce Mon Sep 17 00:00:00 2001 +From ac9df4fb92965f1f95a5bdbde5f2f86d0c569711 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Fri, 26 Jul 2019 17:34:26 -0400 -Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake +Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake Prepend the build flags with those of bitbake. This is to build using the bitbake native sysroot include and library directories. @@ -18,13 +18,13 @@ Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 1bf003523b..28757aed63 100644 +index d369908a09..22c670f316 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -82,35 +82,34 @@ $(error Bad HOST_ARCH) - endif +@@ -85,35 +85,34 @@ endif INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) + INCLUDE += -I $(EDK2_PATH)/MdePkg/Include -CPPFLAGS = $(INCLUDE) +CPPFLAGS += $(INCLUDE) diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 761c2654530..6bbe21ac5c6 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 \ file://0004-reproducible.patch \ " -PV = "edk2-stable202305" -SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" +PV = "edk2-stable202308" +SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e" UPSTREAM_CHECK_GITTAGREGEX = "(?Pedk2-stable.*)" inherit deploy