Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *mesa* to *20.3.1* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe mesa failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1416 entries from dependency cache. INFO: Extracting current version source... Removing 1 recipes from the x86_64 sysroot...done. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.49.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.2+snapshot-d0a8b19f202acb2360689a6c50b202544cefde7f" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:d0a8b19f202acb2360689a6c50b202544cefde7f" workspace = "master-next:afec39415be67b6985f0a0c3de041b4f302ffff3" Initialising tasks...done. Sstate summary: Wanted 0 Found 0 Missed 0 Current 22 (0% match, 100% complete) NOTE: Executing Tasks NOTE: Tasks Summary: Attempted 102 tasks of which 99 didn't need to be rerun and all succeeded. NOTE: Writing buildhistory NOTE: Writing buildhistory took: 2 seconds INFO: Extracting upgraded version source... INFO: Fetching https://mesa.freedesktop.org/archive/mesa-20.3.1.tar.xz... Loading cache...done. Loaded 1416 entries from dependency cache. Parsing recipes...done. Parsing of 808 .bb files complete (806 cached, 2 parsed). 1417 targets, 31 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.49.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.2+snapshot-d0a8b19f202acb2360689a6c50b202544cefde7f" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:d0a8b19f202acb2360689a6c50b202544cefde7f" workspace = "master-next:afec39415be67b6985f0a0c3de041b4f302ffff3" Initialising tasks...done. Sstate summary: Wanted 0 Found 0 Missed 0 Current 18 (0% match, 100% complete) NOTE: Executing Tasks NOTE: Tasks Summary: Attempted 83 tasks of which 81 didn't need to be rerun and all succeeded. NOTE: Writing buildhistory NOTE: Writing buildhistory took: 2 seconds DEBUG 5 [Errno 25] Inappropriate ioctl for device Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 5% |# | ETA: 0:00:03 Adding changed files: 10% |### | ETA: 0:00:02 Adding changed files: 15% |##### | ETA: 0:00:02 Adding changed files: 20% |####### | ETA: 0:00:01 Adding changed files: 25% |######### | ETA: 0:00:01 Adding changed files: 30% |########### | ETA: 0:00:01 Adding changed files: 35% |############ | ETA: 0:00:01 Adding changed files: 40% |############## | ETA: 0:00:01 Adding changed files: 45% |################ | ETA: 0:00:01 Adding changed files: 51% |################## | ETA: 0:00:00 Adding changed files: 56% |#################### | ETA: 0:00:00 Adding changed files: 61% |###################### | ETA: 0:00:00 Adding changed files: 66% |####################### | ETA: 0:00:00 Adding changed files: 71% |######################### | ETA: 0:00:00 Adding changed files: 76% |########################### | ETA: 0:00:00 Adding changed files: 81% |############################# | ETA: 0:00:00 Adding changed files: 86% |############################### | ETA: 0:00:00 Adding changed files: 91% |################################# | ETA: 0:00:00 Adding changed files: 97% |################################## | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:01 WARNING: Command 'git rebase 2d340d5f899248107f90e55cf83b56d85742796a' failed: First, rewinding head to replay your work on top of it... Applying: meson.build: check for all linux host_os combinations Applying: meson.build: make TLS ELF optional Applying: vc4: use intmax_t for formatted output of timespec members Using index info to reconstruct a base tree... M src/gallium/drivers/v3d/v3d_bufmgr.c M src/gallium/drivers/vc4/vc4_bufmgr.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: meson misdetects 64bit atomics on mips/clang Applying: futex.h: Define __NR_futex if it does not exist Applying: anv: fix a build race between generating a header and using it Applying: meson: Add xcb-fixes to loader when using x11 and dri3. Fixes undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c .git/rebase-apply/patch:10: trailing whitespace. if (with_egl or warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M meson.build Falling back to patching base and 3-way merge... Auto-merging meson.build CONFLICT (content): Merge conflict in meson.build error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0007 meson: Add xcb-fixes to loader when using x11 and dri3. Fixes undefined symbol for xcb_xfixes_create_region in loader_dri3_helper.c Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". You will need to resolve conflicts in order to complete the upgrade. INFO: Upgraded source extracted to /home/pokybuild/yocto-worker/auh/build/build/build/workspace/sources/mesa INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/mesa/mesa_20.3.1.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