Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *ovmf* to *edk2-stable202311* has Failed(do_compile).
Detailed error information:
do_compile failed
Next steps:
- apply the patch: git am
0001-ovmf-upgrade-edk2-stable202308-edk2-stable202311.patch
- check the changes to upstream patches and summarize them in the commit
message,
- compile an image that contains the package
- perform some basic sanity tests
- amend the patch and sign it off: git commit -s --reset-author --amend
- send it to the appropriate mailing list
Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.
Please review the attached files for further information and build/update
failures.
Any problem please file a bug at
https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler
Regards,
The Upgrade Helper
-- >8 --
>From fc829e349add8aca5d3bb3072f678b7c902d6fb3 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <a...@yoctoproject.org>
Date: Mon, 1 Jan 2024 05:37:02 +0000
Subject: [PATCH] ovmf: upgrade edk2-stable202308 -> edk2-stable202311
---
...ovmf-update-path-to-native-BaseTools.patch | 10 ++-
...ile-adjust-to-build-in-under-bitbake.patch | 6 +-
.../ovmf/ovmf/0003-debug-prefix-map.patch | 24 ++++---
.../ovmf/ovmf/0004-reproducible.patch | 18 +++---
...005-Committing-changes-from-do_patch.patch | 64 +++++++++++++++++++
meta/recipes-core/ovmf/ovmf_git.bb | 5 +-
6 files changed, 92 insertions(+), 35 deletions(-)
create mode 100644
meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch
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 490d9e8046..8dbd7c711c 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
@@ -1,7 +1,7 @@
-From d8df6b6433351763e1db791dd84d432983d2b249 Mon Sep 17 00:00:00 2001
+From eeb06fecf8cef543b4b33ad8241920f42e0dac9c Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calde...@linux.intel.com>
Date: Thu, 9 Jun 2016 02:23:01 -0700
-Subject: [PATCH 1/4] ovmf: update path to native BaseTools
+Subject: [PATCH] ovmf: update path to native BaseTools
BaseTools is a set of utilities to build EDK-based firmware. These utilities
are used during the build process. Thus, they need to be built natively.
@@ -11,12 +11,13 @@ with the appropriate location before building.
Signed-off-by: Ricardo Neri <ricardo.neri-calde...@linux.intel.com>
Upstream-Status: Inappropriate [oe-core cross compile specific]
+
---
OvmfPkg/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
-index b0334fb76e..094f86f096 100755
+index 279f0d099a..285f061bf4 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -24,7 +24,7 @@ then
@@ -28,6 +29,3 @@ index b0334fb76e..094f86f096 100755
echo $EDK_TOOLS_PATH
source edksetup.sh BaseTools
else
---
-2.30.2
-
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 eeedc9e20f..681b4fb71f 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,4 +1,4 @@
-From ac9df4fb92965f1f95a5bdbde5f2f86d0c569711 Mon Sep 17 00:00:00 2001
+From 1e71c5504f73af6a339ffccb726ef91a2f16b46a Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri-calde...@linux.intel.com>
Date: Fri, 26 Jul 2019 17:34:26 -0400
Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake
@@ -13,6 +13,7 @@ to fight against how upstream wants to configure the build.
Signed-off-by: Ricardo Neri <ricardo.n...@linux.intel.com>
Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups]
+
---
BaseTools/Source/C/Makefiles/header.makefile | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
@@ -64,6 +65,3 @@ index d369908a09..22c670f316 100644
ifeq ($(HOST_ARCH), IA32)
#
# Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386,
but gcc defaults
---
-2.30.2
-
diff --git a/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch
b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch
index c0c763c1cf..a6a4ba15ab 100644
--- a/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch
+++ b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch
@@ -1,7 +1,7 @@
-From 03e536b20d0b72cf078052f6748de8df3836625c Mon Sep 17 00:00:00 2001
+From 39035d1bad673db2367c4ae4f1682060e8f39614 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kana...@gmail.com>
Date: Mon, 14 Jun 2021 19:56:28 +0200
-Subject: [PATCH 3/4] debug prefix map
+Subject: [PATCH] debug prefix map
We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in
--debug-prefix-map to nasm (we carry a patch to nasm for this). The
@@ -17,12 +17,13 @@ the case if the size of the debug symbols varies.
Upstream-Status: Submitted [https://github.com/tianocore/edk2/pull/2202]
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
+
---
BaseTools/Conf/tools_def.template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/BaseTools/Conf/tools_def.template
b/BaseTools/Conf/tools_def.template
-index 503a6687c1..10ac38ef9e 100755
+index c34ecfd557..c17c87d683 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -739,7 +739,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG =
--add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_
@@ -34,7 +35,7 @@ index 503a6687c1..10ac38ef9e 100755
DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian
-mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections
-fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie
DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d
-fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums
-fsigned-char -ffunction-sections -fdata-sections
DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access
-@@ -759,8 +759,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS =
DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
+@@ -760,8 +760,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS =
DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere
DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS)
-Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS)
-Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT)
DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry
_$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map
$(DEST_DIR_DEBUG)/$(BASE_NAME).map
@@ -45,7 +46,7 @@ index 503a6687c1..10ac38ef9e 100755
DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include
$(MODULE_NAME)StrDefs.h
DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h
DEFINE GCC_ASLCC_FLAGS = -x c
-@@ -913,7 +913,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d
-march=loongarch64 DEF(
+@@ -914,7 +914,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d
-march=loongarch64 DEF(
*_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS)
*_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_GCC48_IA32_OBJCOPY_FLAGS =
@@ -54,7 +55,7 @@ index 503a6687c1..10ac38ef9e 100755
DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS)
RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS)
-Wno-unused-but-set-variable
-@@ -941,7 +941,7 @@ RELEASE_GCC48_IA32_CC_FLAGS =
DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
+@@ -942,7 +942,7 @@ RELEASE_GCC48_IA32_CC_FLAGS =
DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set
*_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS)
*_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_GCC48_X64_OBJCOPY_FLAGS =
@@ -63,7 +64,7 @@ index 503a6687c1..10ac38ef9e 100755
DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)
RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS)
-Wno-unused-but-set-variable
-@@ -1050,7 +1050,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS =
DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
+@@ -1051,7 +1051,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS =
DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
*_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS)
*_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_GCC49_IA32_OBJCOPY_FLAGS =
@@ -72,7 +73,7 @@ index 503a6687c1..10ac38ef9e 100755
DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS)
RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS)
-Wno-unused-but-set-variable -Wno-unused-const-variable
-@@ -1078,7 +1078,7 @@ RELEASE_GCC49_IA32_CC_FLAGS =
DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
+@@ -1079,7 +1079,7 @@ RELEASE_GCC49_IA32_CC_FLAGS =
DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set
*_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS)
*_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_GCC49_X64_OBJCOPY_FLAGS =
@@ -81,7 +82,7 @@ index 503a6687c1..10ac38ef9e 100755
DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)
RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS)
-Wno-unused-but-set-variable -Wno-unused-const-variable
-@@ -1337,7 +1337,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z
common-page-size=0x20
+@@ -1338,7 +1338,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z
common-page-size=0x20
*_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie
*_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
*_GCC5_IA32_OBJCOPY_FLAGS =
@@ -90,7 +91,7 @@ index 503a6687c1..10ac38ef9e 100755
DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto
DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os
-Wl,-m,elf_i386,--oformat=elf32-i386
-@@ -1369,7 +1369,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS =
DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
+@@ -1370,7 +1370,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS =
DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
*_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS)
*_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
*_GCC5_X64_OBJCOPY_FLAGS =
@@ -99,6 +100,3 @@ index 503a6687c1..10ac38ef9e 100755
DEBUG_GCC5_X64_CC_FLAGS = DEF(GCC5_X64_CC_FLAGS) -flto -DUSING_LTO
DEBUG_GCC5_X64_DLINK_FLAGS = DEF(GCC5_X64_DLINK_FLAGS) -flto -Os
---
-2.30.2
-
diff --git a/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch
b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch
index c3fdc3d863..8eb0ad8f0b 100644
--- a/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch
+++ b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch
@@ -1,7 +1,7 @@
-From c59850367a190d70dec43e0a66f399a4d8a5ffed Mon Sep 17 00:00:00 2001
+From f045e00b8db5a2b1c5ac40c9099482850b431164 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kana...@gmail.com>
Date: Mon, 14 Jun 2021 19:57:30 +0200
-Subject: [PATCH 4/4] reproducible
+Subject: [PATCH] reproducible
This patch fixes various things which make the build more reproducible. Some
changes
here only change intermediate artefacts but that means when you have two build
trees
@@ -27,6 +27,7 @@ The patch specifically:
Upstream-Status: Submitted [https://github.com/tianocore/edk2/pull/2176]
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
+
---
BaseTools/Source/C/GenFw/Elf64Convert.c | 8 ++++---
.../Source/Python/AutoGen/BuildEngine.py | 3 +++
@@ -35,10 +36,10 @@ Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c
b/BaseTools/Source/C/GenFw/Elf64Convert.c
-index 9c17c90b16..fcc7864141 100644
+index 9911db65af..bd87909066 100644
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
-@@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
+@@ -13,6 +13,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef __GNUC__
#include <windows.h>
#include <io.h>
@@ -47,7 +48,7 @@ index 9c17c90b16..fcc7864141 100644
#endif
#include <assert.h>
#include <stdio.h>
-@@ -990,7 +992,7 @@ ScanSections64 (
+@@ -988,7 +990,7 @@ ScanSections64 (
}
mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) +
sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) +
@@ -56,7 +57,7 @@ index 9c17c90b16..fcc7864141 100644
//
// Add more space in the .debug data region for the DllCharacteristicsEx
-@@ -2261,7 +2263,7 @@ WriteDebug64 (
+@@ -2279,7 +2281,7 @@ WriteDebug64 (
EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10;
EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry;
@@ -65,7 +66,7 @@ index 9c17c90b16..fcc7864141 100644
NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset);
DataDir =
&NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG];
-@@ -2294,7 +2296,7 @@ WriteDebug64 (
+@@ -2312,7 +2314,7 @@ WriteDebug64 (
Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1);
Nb10->Signature = CODEVIEW_SIGNATURE_NB10;
@@ -175,6 +176,3 @@ index d05410b329..99b3f64aba 100755
# Ignore generating makefile when it is a binary module
if self.IsBinaryModule:
---
-2.30.2
-
diff --git
a/meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch
b/meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch
new file mode 100644
index 0000000000..d46b7654e1
--- /dev/null
+++ b/meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch
@@ -0,0 +1,64 @@
+From c56bd83ed8626a8a421224ff4ad779390cd20826 Mon Sep 17 00:00:00 2001
+From: OpenEmbedded <oe.patch@oe>
+Date: Mon, 1 Jan 2024 05:35:52 +0000
+Subject: [PATCH] Committing changes from do_patch
+
+---
+ BaseTools/Source/C/Makefiles/app.makefile | 6 ++++++
+ BaseTools/Source/C/VfrCompile/GNUmakefile | 10 ++++++++++
+ OvmfPkg/build.sh | 2 +-
+ 3 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/BaseTools/Source/C/Makefiles/app.makefile
b/BaseTools/Source/C/Makefiles/app.makefile
+index 506343a6e0..9fb860c5f8 100644
+--- a/BaseTools/Source/C/Makefiles/app.makefile
++++ b/BaseTools/Source/C/Makefiles/app.makefile
+@@ -10,6 +10,12 @@ MAKEROOT ?= ../..
+ include $(MAKEROOT)/Makefiles/header.makefile
+
+ APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
++CC = x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
++CXX = x86_64-poky-linux-g++ -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
++AS = x86_64-poky-linux-as
++AR = x86_64-poky-linux-gcc-ar
++LD = x86_64-poky-linux-ld
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
++LINKER = $(CC)
+
+ .PHONY:all
+ all: $(MAKEROOT)/bin $(APPLICATION)
+diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile
b/BaseTools/Source/C/VfrCompile/GNUmakefile
+index 7d5976649d..ceebc42d2c 100644
+--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
++++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
+@@ -19,8 +19,18 @@ OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o
EfiVfrParser.o VfrLexer.o VfrSyn
+ CLANG:=$(shell $(CC) --version | grep clang)
+ ifneq ($(CLANG),)
+ VFR_CPPFLAGS = -Wno-deprecated-register -std=c++14 -DPCCTS_USE_NAMESPACE_STD
$(CPPFLAGS)
++CC = x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
++CXX = x86_64-poky-linux-g++ -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
++AS = x86_64-poky-linux-as
++AR = x86_64-poky-linux-gcc-ar
++LD = x86_64-poky-linux-ld
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
+ else
+ VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(CPPFLAGS)
++CC = x86_64-poky-linux-gcc -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
++CXX = x86_64-poky-linux-g++ -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
++AS = x86_64-poky-linux-as
++AR = x86_64-poky-linux-gcc-ar
++LD = x86_64-poky-linux-ld
--sysroot=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot
+ endif
+ # keep BUILD_OPTFLAGS last
+ VFR_CXXFLAGS = $(BUILD_OPTFLAGS)
+diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
+index 285f061bf4..79f2c87446 100755
+--- a/OvmfPkg/build.sh
++++ b/OvmfPkg/build.sh
+@@ -24,7 +24,7 @@ then
+ # this assumes svn pulls have the same root dir
+ # export EDK_TOOLS_PATH=`pwd`/../BaseTools
+ # This version is for the tools source in edk2
+- export EDK_TOOLS_PATH=BBAKE_EDK_TOOLS_PATH/BaseTools
++ export
EDK_TOOLS_PATH=/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202308/devtooltmp-lmniueev/workdir/recipe-sysroot-native/usr/bin/edk2_basetools/BaseTools
+ echo $EDK_TOOLS_PATH
+ source edksetup.sh BaseTools
+ else
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb
b/meta/recipes-core/ovmf/ovmf_git.bb
index 3dc031d3b6..dcb29c3b14 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -24,10 +24,11 @@ SRC_URI =
"gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
file://0003-debug-prefix-map.patch \
file://0004-reproducible.patch \
+ file://0005-Committing-changes-from-do_patch.patch \
"
-PV = "edk2-stable202308"
-SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e"
+PV = "edk2-stable202311"
+SRCREV = "8736b8fdca85e02933cdb0a13309de14c9799ece"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
inherit deploy
--
2.42.0
NOTE: Reconnecting to bitbake server... Loading cache...done. Loaded 1847 entries from dependency cache. Parsing recipes...done. Parsing of 913 .bb files complete (912 cached, 1 parsed). 1847 targets, 38 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.6.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "4.3+snapshot-4444f8d4b855767f2a6ded3bfb5607c339a60a43" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp workspace = "tmp-auh-upgrades:4444f8d4b855767f2a6ded3bfb5607c339a60a43" Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure Sstate summary: Wanted 211 Local 193 Mirrors 0 Missed 18 Current 298 (91% match, 96% complete) done. NOTE: Executing Tasks NOTE: Running setscene task 316 of 509 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb:do_create_spdx_setscene) NOTE: Running setscene task 337 of 509 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/util-linux/util-linux_2.39.2.bb:do_create_spdx_setscene) NOTE: Running setscene task 359 of 509 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/nasm/nasm_2.16.01.bb:do_create_spdx_setscene) NOTE: Running setscene task 399 of 509 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-extended/acpica/acpica_20230628.bb:do_create_spdx_setscene) NOTE: Running task 360 of 1607 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_recipe_qa) NOTE: Running task 361 of 1607 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_recipe_qa) NOTE: recipe ovmf-edk2-stable202311-r0: task do_recipe_qa: Started NOTE: recipe gcc-runtime-13.2.0-r0: task do_create_spdx_setscene: Started NOTE: recipe acpica-native-20230628-r0: task do_create_spdx_setscene: Started NOTE: recipe nasm-native-2.16.01-r0: task do_create_spdx_setscene: Started NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_recipe_qa: Started NOTE: recipe util-linux-native-2.39.2-r0: task do_create_spdx_setscene: Started NOTE: recipe gcc-runtime-13.2.0-r0: task do_create_spdx_setscene: Succeeded NOTE: Running setscene task 467 of 509 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/glibc/glibc_2.38.bb:do_create_spdx_setscene) NOTE: recipe acpica-native-20230628-r0: task do_create_spdx_setscene: Succeeded NOTE: recipe nasm-native-2.16.01-r0: task do_create_spdx_setscene: Succeeded NOTE: recipe ovmf-edk2-stable202311-r0: task do_recipe_qa: Succeeded NOTE: recipe util-linux-native-2.39.2-r0: task do_create_spdx_setscene: Succeeded NOTE: Task /home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_recipe_qa unihash changed to f4128a1b41f18b477cee05057e7c44fd17a3339068d8e40ca790e807dd58a3b7 NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_recipe_qa: Succeeded NOTE: recipe glibc-2.38+git-r0: task do_create_spdx_setscene: Started NOTE: Task virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_recipe_qa unihash changed to c691f0c5c0a9a30a31ad7a0b369a1caf0492b30f0966511a7f76bf64b69ceeb0 NOTE: recipe glibc-2.38+git-r0: task do_create_spdx_setscene: Succeeded NOTE: Running setscene task 476 of 509 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_create_spdx_setscene) NOTE: Running task 586 of 1607 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_fetch) NOTE: Running task 587 of 1607 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_fetch) NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_create_spdx_setscene: Started NOTE: recipe ovmf-edk2-stable202311-r0: task do_fetch: Started NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_fetch: Started NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_create_spdx_setscene: Succeeded NOTE: Setscene tasks completed NOTE: recipe ovmf-edk2-stable202311-r0: task do_fetch: Succeeded NOTE: Running task 1577 of 1607 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_unpack) NOTE: recipe ovmf-edk2-stable202311-r0: task do_unpack: Started NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_fetch: Succeeded NOTE: Running task 1578 of 1607 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_unpack) NOTE: Running task 1579 of 1607 (virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_prepare_recipe_sysroot) NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_unpack: Started NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_prepare_recipe_sysroot: Started NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_prepare_recipe_sysroot: Succeeded NOTE: recipe ovmf-edk2-stable202311-r0: task do_unpack: Succeeded NOTE: Running task 1580 of 1607 (/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_patch) NOTE: recipe ovmf-edk2-stable202311-r0: task do_patch: Started NOTE: recipe ovmf-edk2-stable202311-r0: task do_patch: Failed NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_unpack: Succeeded NOTE: Tasks Summary: Attempted 1580 tasks of which 1572 didn't need to be rerun and 1 failed. NOTE: Writing buildhistory NOTE: Writing buildhistory took: 3 seconds NOTE: The errors for this build are stored in /home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240101053618.txt You can send the errors to a reports server by running: send-error-report /home/pokybuild/yocto-worker/auh/build/build/tmp/log/error-report/error_report_20240101053618.txt [-s server] NOTE: The contents of these logs will be posted in public if you use the above command with the default server. Please ensure you remove any identifying or proprietary information when prompted before sending. Summary: 1 task failed: /home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_patch Summary: There were 2 ERROR messages, returning a non-zero exit code. ERROR: ovmf-edk2-stable202311-r0 do_patch: QA Issue: Missing Upstream-Status in patch /home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch Please add according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status . [patch-status] ERROR: ovmf-edk2-stable202311-r0 do_patch: Fatal QA errors were found, failing task. ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202311/temp/log.do_patch.2158889 ERROR: Task (/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_patch) failed with exit code '1'
0001-ovmf-upgrade-edk2-stable202308-edk2-stable202311.patch
Description: Binary data
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#193109): https://lists.openembedded.org/g/openembedded-core/message/193109 Mute This Topic: https://lists.openembedded.org/mt/103461906/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
