From patchwork Mon Jan 15 17:33:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 37843 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B623C531C1 for ; Mon, 15 Jan 2024 17:34:01 +0000 (UTC) Received: from a27-191.smtp-out.us-west-2.amazonses.com (a27-191.smtp-out.us-west-2.amazonses.com [54.240.27.191]) by mx.groups.io with SMTP id smtpd.web10.88852.1705340029679871130 for ; Mon, 15 Jan 2024 09:33:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=XJZ4n8Nh; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=HSMmNn5X; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.191, mailfrom: 0101018d0e2fc72d-273c79f4-e8cd-402d-8c29-d6b829432645-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1705340028; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date; bh=nD/MmenwjzBOPxLGXDzfvkb79NWrBy2OxmKmvb2fDY0=; b=XJZ4n8Nh5hZGmZIFNgCVF+3Ejc01HYkRnGBHD+cWXM1RTSOuHt7JW0e2Z/fhwJHz DTlucgSRevCukhKeH5MAtidnaeE4sAzXL2t3CIvxZ2Oe+y49bQfEekFlOZROF6QBNxz n5tCuPFtP5zFR1j1EvcpMtrHbUImAQKZJkPbVZ4w= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1705340028; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date:Feedback-ID; bh=nD/MmenwjzBOPxLGXDzfvkb79NWrBy2OxmKmvb2fDY0=; b=HSMmNn5XrWbjgPR9yLHgFlpDCWxLvXtduTPz16zWQQ+IstITBY7aee42REVxYNOT +CsoZbBuDhZ12rYoYWA45jvBcIopoHFrK2pcFC19KwJa0E9p7GMbxOr+yZyrl8OPx67 DlHBq1712Vl124TdTc/Jn4OqIH9dkHBJ4mfF4xFI= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Subject: [AUH] ovmf: upgrading to edk2-stable202311 FAILED Message-ID: <0101018d0e2fc72d-273c79f4-e8cd-402d-8c29-d6b829432645-000000@us-west-2.amazonses.com> Date: Mon, 15 Jan 2024 17:33:48 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.01.15-54.240.27.191 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:34:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/193715 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 e14724a09cfc1168826f30123d9465ecaf0e0f3c Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 15 Jan 2024 05:48:40 +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..abdc080f99 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 09e2513456b785c990f50bd3e9451f2a3e69b642 Mon Sep 17 00:00:00 2001 From: Ricardo Neri 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 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..8dc5f11413 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 ec2ee3ada86ea9fd7a705e90687d04631291d528 Mon Sep 17 00:00:00 2001 From: Ricardo Neri 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 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..a741e11a0f 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 f3e51d74770a62e2a2ca0cacdf262d1df348ad4e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 Signed-off-by: Alexander Kanavin + --- 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..975d2c8845 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 4b64710c90f1f8d96c130c6f60214107189ae517 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 Signed-off-by: Alexander Kanavin + --- BaseTools/Source/C/GenFw/Elf64Convert.c | 8 ++++--- .../Source/Python/AutoGen/BuildEngine.py | 3 +++ @@ -35,10 +36,10 @@ Signed-off-by: Alexander Kanavin 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 #include @@ -47,7 +48,7 @@ index 9c17c90b16..fcc7864141 100644 #endif #include #include -@@ -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..0f3d8115c4 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch @@ -0,0 +1,64 @@ +From b9a36e5ad51df9a7a859885ede7d526417793383 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded +Date: Mon, 15 Jan 2024 05:47:31 +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..5293111d63 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-s2nj0rth/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-s2nj0rth/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-s2nj0rth/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..075680e431 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-s2nj0rth/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-s2nj0rth/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-s2nj0rth/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-s2nj0rth/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-s2nj0rth/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-s2nj0rth/workdir/recipe-sysroot + endif + # keep BUILD_OPTFLAGS last + VFR_CXXFLAGS = $(BUILD_OPTFLAGS) +diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh +index 285f061bf4..5fe6f2d9a8 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-s2nj0rth/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 = "(?Pedk2-stable.*)" inherit deploy