To: ['Ross Burton '] To: openembedded-core@lists.openembedded.org Subject: [AUH] vulkan-samples: upgrading to 47d9b80425599c4dec2b9c510cb2ede3416317ec 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 *47d9b80425599c4dec2b9c510cb2ede3416317ec* has Failed (devtool error). Detailed error information: The following devtool command failed: upgrade vulkan-samples -S 47d9b80425599c4dec2b9c510cb2ede3416317ec NOTE: Reconnecting to bitbake server... Loading cache...done. Loaded 1928 entries from dependency cache. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.15.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "5.2.99+snapshot-8d8353e61e120881c9c3ba4e5ebca0251179b1bd" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp workspace = "tmp-auh-upgrades:8d8353e61e120881c9c3ba4e5ebca0251179b1bd" 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: 2 seconds INFO: Extracting current version source... INFO: Extracting upgraded version source... INFO: Rebasing devtool onto 47d9b80425599c4dec2b9c510cb2ede3416317ec WARNING: Command 'git rebase 47d9b80425599c4dec2b9c510cb2ede3416317ec' failed: CONFLICT (modify/delete): third_party/glslang deleted in HEAD and modified in e1f3b14 (Add changes from do_patch). Version e1f3b14 (Add changes from do_patch) of third_party/glslang left in tree. ERROR: Execution of 'git checkout devtool' failed with exit code 1: error: you need to resolve your current index first third_party/glslang: needs merge 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