To: ['Ross Burton '] To: Subject: [AUH] vulkan-samples: upgrading to 19c24321215c4d12af4e14c5b78a891ca71d4240 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 *19c24321215c4d12af4e14c5b78a891ca71d4240* has Failed (devtool error). Detailed error information: The following devtool command failed: upgrade vulkan-samples -S 19c24321215c4d12af4e14c5b78a891ca71d4240 NOTE: Reconnecting to bitbake server... Loading cache...done. Loaded 1942 entries from dependency cache. 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-345ee8beaec03b277c766d19f7546042a0406dd8" TUNE_FEATURES = "m64 x86-64-v3" TARGET_FPU = "" meta = "master:345ee8beaec03b277c766d19f7546042a0406dd8" meta-yocto-bsp meta-poky = "master:fe65e142d0d9ba0e51ff9175ffa82e902f982a20" workspace = ":" 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: 2 seconds INFO: Extracting current version source... INFO: Extracting upgraded version source... INFO: Rebasing devtool onto 19c24321215c4d12af4e14c5b78a891ca71d4240 WARNING: Command 'git rebase 19c24321215c4d12af4e14c5b78a891ca71d4240' failed: CONFLICT (modify/delete): third_party/glslang deleted in HEAD and modified in 7eeb613 (Add changes from do_patch). Version 7eeb613 (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