To: ['Ross Burton <ross.burton@arm.com>']
To: openembedded-core@lists.openembedded.org
Subject: [AUH] vulkan-samples: upgrading to 9487ac2f3be74dd0d3ce4580d3fd45cee0359cb1 FAILED
Attachments: 

Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe(s) *vulkan-samples* to *9487ac2f3be74dd0d3ce4580d3fd45cee0359cb1* has Failed (devtool error).

Detailed error information:

The following devtool command failed:  upgrade vulkan-samples -S 9487ac2f3be74dd0d3ce4580d3fd45cee0359cb1
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1883 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies

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

Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure
Sstate summary: Wanted 4 Local 4 Mirrors 0 Missed 0 Current 26 (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: 3 seconds

INFO: Extracting current version source...
INFO: Extracting upgraded version source...
INFO: Rebasing devtool onto 9487ac2f3be74dd0d3ce4580d3fd45cee0359cb1
WARNING: Command 'git rebase 9487ac2f3be74dd0d3ce4580d3fd45cee0359cb1' failed:
Failed to merge submodule third_party/spdlog
CONFLICT (submodule): Merge conflict in third_party/spdlog
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
 - go to submodule (third_party/spdlog), and either merge commit 90ce4aae
   or update to an existing commit which has merged those changes
 - come back to superproject and run:

      git add third_party/spdlog

   to record the above merge or update
 - resolve any other conflicts in the superproject
 - commit the resulting index in the superproject

You will need to resolve conflicts in order to complete the upgrade.
ERROR: Execution of 'git rev-list devtool-base..b84c498eb7919a3e8f49419434394451009eb7d5' failed with exit code 128:
fatal: Invalid revision range devtool-base..b84c498eb7919a3e8f49419434394451009eb7d5



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
