From patchwork Fri Dec 1 13:14:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 35508 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 0CFEFC10F05 for ; Fri, 1 Dec 2023 13:14:57 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web10.22314.1701436490888601934 for ; Fri, 01 Dec 2023 05:14:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=Hk2jLbEL; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=jekEmMF9; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 0101018c258481bd-f84082e7-a4d7-45b7-9b75-982dadc7739e-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=1701436490; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date; bh=BZHxMpumkLzsAMymxUehiZ+4uUvh6o30VzQJcsmoCH0=; b=Hk2jLbELEmyvyZb4+Tz5N4AEi4s+WEFNioU8YjOhIaoCMZpr1MJqEFH6awzOlk0q lG7xmIFbSpt/pT2onL9cYlNHfwtoYWXOd9OnUzLg6nJtPLRaNCcLoeLSHr0RJxSqLZ4 q9ysdlll7LgaFmNhHCnV7XgZjzk0hkauBMNCnbnc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1701436490; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date:Feedback-ID; bh=BZHxMpumkLzsAMymxUehiZ+4uUvh6o30VzQJcsmoCH0=; b=jekEmMF9u31kB08Jx54JDdWOcvVn0MfhxZbVgJjpmqNopS+DLwTinoKFJ3OW6Hdl J+HTYuchsSs/6svrYRAadymqbwL98Pc6ND8uGAXtPrcZfve8CRQs3If7RrAbDmjMoT0 TvjjmkdKHlhbFGeOM6beCVFnq0vv7Xdk00OL1zr4= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Subject: [AUH] ovmf: upgrading to edk2-stable202311 FAILED Message-ID: <0101018c258481bd-f84082e7-a4d7-45b7-9b75-982dadc7739e-000000@us-west-2.amazonses.com> Date: Fri, 1 Dec 2023 13:14:50 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.12.01-54.240.27.193 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 ; Fri, 01 Dec 2023 13:14:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191578 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 ef806c71fbd99d3c833338ebbdfa3a167f9f1b14 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 1 Dec 2023 06:22:11 +0000 Subject: [PATCH] ovmf: upgrade edk2-stable202308 -> edk2-stable202311 --- ...005-Committing-changes-from-do_patch.patch | 64 +++++++++++++++++++ meta/recipes-core/ovmf/ovmf_git.bb | 5 +- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch 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..98ee08f42b --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0005-Committing-changes-from-do_patch.patch @@ -0,0 +1,64 @@ +From 44e0c490936cda49a07d529ffb70f3df43fedf13 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded +Date: Fri, 1 Dec 2023 06:20:13 +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..a4a2337ea8 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-c0ft75y0/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-c0ft75y0/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-c0ft75y0/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..16a6fac56b 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-c0ft75y0/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-c0ft75y0/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-c0ft75y0/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-c0ft75y0/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-c0ft75y0/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-c0ft75y0/workdir/recipe-sysroot + endif + # keep BUILD_OPTFLAGS last + VFR_CXXFLAGS = $(BUILD_OPTFLAGS) +diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh +index 285f061bf4..0be1c32154 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-c0ft75y0/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