To: ['openembedded-core@lists.openembedded.org']
To: 
Subject: [AUH] ovmf: upgrading to edk2-stable202505 FAILED
Attachments: 

Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe(s) *ovmf* to *edk2-stable202505* has Failed (devtool error).

Detailed error information:

Running 'devtool upgrade' for recipe ovmf failed.
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1941 entries from dependency cache.
Removing 1 recipes from the qemux86_64 sysroot...done.
Removing 1 recipes from the x86_64 sysroot...done.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "2.15.2"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "5.2.99+snapshot-30d3ec7ab6c980e7fe25760be1834b680d5914ab"
TUNE_FEATURES        = "m64 core2"
TARGET_FPU           = ""
meta                 
meta-poky            
meta-yocto-bsp       
workspace            = "tmp-auh-upgrades:30d3ec7ab6c980e7fe25760be1834b680d5914ab"

Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure
Sstate summary: Wanted 10 Local 10 Mirrors 0 Missed 0 Current 20 (100% match, 100% complete)
done.
NOTE: Executing Tasks
NOTE: Tasks Summary: Attempted 103 tasks of which 100 didn't need to be rerun and all succeeded.
NOTE: Writing buildhistory
NOTE: Writing buildhistory took: 1 seconds
INFO: Extracting current version source...
INFO: Extracting upgraded version source...
INFO: Rebasing devtool onto 6951dfe7d59d144a3a980bd7eda699db2d8554ac
WARNING: Command 'git rebase 6951dfe7d59d144a3a980bd7eda699db2d8554ac' failed:
Auto-merging BaseTools/Conf/tools_def.template
CONFLICT (content): Merge conflict in BaseTools/Conf/tools_def.template

You will need to resolve conflicts in order to complete the upgrade.
INFO: Rebasing devtool onto f4153a09f87cbb9c826d8fc12c74642bb2d879ea
INFO: Rebasing devtool onto 8c89224991adff88d53cd380f42a2baa36f91454
INFO: Rebasing devtool onto a26d85337dbdcd33c971f38eb3fa5150e75cea87
INFO: Rebasing devtool onto f4153a09f87cbb9c826d8fc12c74642bb2d879ea
INFO: Rebasing devtool onto abfc8ff81df4067f309032467785e06975678f0d
INFO: Rebasing devtool onto cfff805481bdea27f900c32698171286542b8d3c
INFO: Rebasing devtool onto 370b5944c046bab043dd8b133727b2135af7747a
INFO: Rebasing devtool onto e9ebfa7e77a6bee77df44e096b100e7131044059
INFO: Rebasing devtool onto 98ef964e1e9a0c39c7efb67143d3a13a819432e0
INFO: Rebasing devtool onto 1cc9cde3448cdd2e000886a26acf1caac2db7cf1
INFO: Rebasing devtool onto 86add13493e5c881d7e4ba77fb91c1f57752b3a4
INFO: Rebasing devtool onto 83d4e1ebef3588fae48b69a7352cc21801cb70bc
INFO: Using source tree as build directory since that would be the default for this recipe
INFO: Upgraded source extracted to /srv/pokybuild/yocto-worker/auh/build/build/workspace/sources/ovmf
INFO: New recipe is /srv/pokybuild/yocto-worker/auh/build/build/workspace/recipes/ovmf/ovmf_git.bb



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