mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

ovmf: update edk2-stable202305 -> edk2-stable202308

Browse Source 
(From OE-Core rev: 48878248d39d7e0bf66f33051f7ecef49c14e1e1)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-09-17 11:38:49 +02:00
committed by Richard Purdie
parent d8ad963a22
commit efddfa97a2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
+5 -5
View File
@@ -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 <ricardo.neri-calderon@linux.intel.com> From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Date: Fri, 26 Jul 2019 17:34:26 -0400 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 Prepend the build flags with those of bitbake. This is to build
using the bitbake native sysroot include and library directories. 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(-) 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile 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 --- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -82,35 +82,34 @@ $(error Bad HOST_ARCH) @@ -85,35 +85,34 @@ endif
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 = $(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)
+CPPFLAGS += $(INCLUDE) +CPPFLAGS += $(INCLUDE)
meta/recipes-core/ovmf/ovmf_git.bb
+2 -2
View File
@@ -26,8 +26,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
file://0004-reproducible.patch \ file://0004-reproducible.patch \
" "
PV = "edk2-stable202305" PV = "edk2-stable202308"
SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
inherit deploy inherit deploy