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 <[email protected]>
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 <oe.patch@oe>
+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 = "(?P<pver>edk2-stable.*)"
inherit deploy
--
2.39.2
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1844 entries from dependency cache.
Parsing recipes...done.
Parsing of 912 .bb files complete (911 cached, 1 parsed). 1844 targets, 38
skipped, 0 masked, 0 errors.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "2.6.0"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "universal"
TARGET_SYS = "x86_64-poky-linux"
MACHINE = "qemux86-64"
DISTRO = "poky"
DISTRO_VERSION = "4.3+snapshot-b9071eab7e4f24e5082cd94f7aaaf110d3d3dbd6"
TUNE_FEATURES = "m64 core2"
TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp
workspace =
"tmp-auh-upgrades:b9071eab7e4f24e5082cd94f7aaaf110d3d3dbd6"
Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing
build without monitoring pressure
done.
Sstate summary: Wanted 135 Local 117 Mirrors 0 Missed 18 Current 323 (86%
match, 96% complete)
NOTE: Executing Tasks
NOTE: Running setscene task 340 of 458
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb:do_create_spdx_setscene)
NOTE: Running setscene task 355 of 458
(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 365 of 458
(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 373 of 458
(virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-extended/acpica/acpica_20230628.bb:do_create_spdx_setscene)
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: Running task 368 of 1437
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_recipe_qa)
NOTE: Running task 369 of 1437
(virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_recipe_qa)
NOTE: recipe util-linux-native-2.39.2-r0: task do_create_spdx_setscene: Started
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 gcc-runtime-13.2.0-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running setscene task 420 of 458
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/glibc/glibc_2.38.bb:do_create_spdx_setscene)
NOTE: recipe util-linux-native-2.39.2-r0: task do_create_spdx_setscene:
Succeeded
NOTE: recipe ovmf-edk2-stable202311-r0: task do_recipe_qa: Started
NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_recipe_qa: Started
NOTE: recipe glibc-2.38+git-r0: task do_create_spdx_setscene: Started
NOTE: recipe ovmf-edk2-stable202311-r0: task do_recipe_qa: Succeeded
NOTE: Running task 531 of 1437
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_fetch)
NOTE: recipe ovmf-native-edk2-stable202311-r0: task do_recipe_qa: Succeeded
NOTE: Running task 532 of 1437
(virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_fetch)
NOTE: recipe glibc-2.38+git-r0: task do_create_spdx_setscene: Succeeded
NOTE: Running setscene task 432 of 458
(/home/pokybuild/yocto-worker/auh/build/meta/recipes-devtools/gcc/gcc-cross_13.2.bb:do_create_spdx_setscene)
NOTE: recipe ovmf-edk2-stable202311-r0: task do_fetch: Started
NOTE: recipe gcc-cross-x86_64-13.2.0-r0: task do_create_spdx_setscene: 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 1407 of 1437
(/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 1408 of 1437
(virtual:native:/home/pokybuild/yocto-worker/auh/build/meta/recipes-core/ovmf/ovmf_git.bb:do_unpack)
NOTE: Running task 1409 of 1437
(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 1410 of 1437
(/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 1410 tasks of which 1402 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_20231201062033.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_20231201062033.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 was 1 ERROR message, returning a non-zero exit code.
ERROR: ovmf-edk2-stable202311-r0 do_patch: Applying patch
'0005-Committing-changes-from-do_patch.patch' on target directory
'/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202311/git'
CmdError('quilt --quiltrc
/home/pokybuild/yocto-worker/auh/build/build/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202311/recipe-sysroot-native/etc/quiltrc
push', 0, 'stdout: Applying patch 0005-Committing-changes-from-do_patch.patch
patching file BaseTools/Source/C/Makefiles/app.makefile
Hunk #1 FAILED at 10 (different line endings).
1 out of 1 hunk FAILED -- rejects in file
BaseTools/Source/C/Makefiles/app.makefile
patching file BaseTools/Source/C/VfrCompile/GNUmakefile
Hunk #1 FAILED at 19 (different line endings).
1 out of 1 hunk FAILED -- rejects in file
BaseTools/Source/C/VfrCompile/GNUmakefile
patching file OvmfPkg/build.sh
Patch 0005-Committing-changes-from-do_patch.patch does not apply (enforce with
-f)
stderr: ')
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.3867978
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 (#191578): https://lists.openembedded.org/g/openembedded-core/message/191578 Mute This Topic: https://lists.openembedded.org/mt/102914358/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
