Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *gnutls* to *3.6.15* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe gnutls failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1533 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.47.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.1+snapshot-20201016" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:2b405e4ce0606aa0551e0f38cf8106f6c8fcb742" workspace = "master:ad30a6d470eca0f5be5c037ba37fad72e55a128c" 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://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.15.tar.xz... Loading cache...done. Loaded 1533 entries from dependency cache. Parsing recipes...done. Parsing of 786 .bb files complete (784 cached, 2 parsed). 1357 targets, 35 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.47.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.1+snapshot-20201016" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:2b405e4ce0606aa0551e0f38cf8106f6c8fcb742" workspace = "master:ad30a6d470eca0f5be5c037ba37fad72e55a128c" 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: 7% |## | ETA: 0:00:02 Adding changed files: 14% |##### | ETA: 0:00:01 Adding changed files: 21% |####### | ETA: 0:00:01 Adding changed files: 28% |########## | ETA: 0:00:00 Adding changed files: 35% |############ | ETA: 0:00:00 Adding changed files: 42% |############### | ETA: 0:00:00 Adding changed files: 49% |################# | ETA: 0:00:00 Adding changed files: 56% |#################### | ETA: 0:00:00 Adding changed files: 63% |###################### | ETA: 0:00:00 Adding changed files: 70% |######################### | ETA: 0:00:00 Adding changed files: 77% |########################### | ETA: 0:00:00 Adding changed files: 84% |############################## | ETA: 0:00:00 Adding changed files: 91% |################################ | ETA: 0:00:00 Adding changed files: 98% |################################### | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:00 WARNING: Command 'git rebase c9e95203ec305fc6fe966f01fe01d5591222fcfd' failed: First, rewinding head to replay your work on top of it... Applying: gnutls: account for ARM_EABI Applying: Modied the license to GPLv2.1+ to keep with LICENSE file. Using index info to reconstruct a base tree... M lib/x509/krb5.c M lib/x509/krb5.h Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: handshake: reject no_renegotiation alert if handshake is incomplete Using index info to reconstruct a base tree... M lib/gnutls_int.h M lib/handshake.c Falling back to patching base and 3-way merge... Auto-merging lib/handshake.c CONFLICT (content): Merge conflict in lib/handshake.c Auto-merging lib/gnutls_int.h error: Failed to merge in the changes. Patch failed at 0003 handshake: reject no_renegotiation alert if handshake is incomplete Use 'git am --show-current-patch' to see the failed patch 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/gnutls INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/gnutls/gnutls_3.6.15.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