From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.yoctoproject.org (mail.yoctoproject.org []) by mx.groups.io with SMTP id smtpd.web11.5827.1624805202599634219 for ; Sun, 27 Jun 2021 07:46:42 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: auh.yoctoproject.org, ip: , mailfrom: auh@auh.yoctoproject.org) Received: from [127.0.1.1] (unknown [172.29.10.115]) by mail.yoctoproject.org (Postfix) with ESMTP id 102EC38C12E1 for ; Sun, 27 Jun 2021 14:46:42 +0000 (UTC) MIME-Version: 1.0 From: auh@auh.yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] rt-tests: upgrading to 2.0 FAILED Message-ID: Content-Type: multipart/mixed; boundary="===============5937654035091681646==" --===============5937654035091681646== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *rt-tests* to *2.0* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe rt-tests failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1455 entries from dependency cache. INFO: Extracting current version source... NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.51.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.3+snapshot-471fff3467c32296365d984e48bc05e9293c4cc8" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:471fff3467c32296365d984e48bc05e9293c4cc8" workspace = "master:3ea3e3435fc7d94e6eb04cf9cd9f66ee946f6af6" Initialising tasks...done. Sstate summary: Wanted 0 Local 0 Network 0 Missed 0 Current 20 (0% match, 100% complete) NOTE: Executing Tasks NOTE: Tasks Summary: Attempted 93 tasks of which 90 didn't need to be rerun and all succeeded. NOTE: Writing buildhistory NOTE: Writing buildhistory took: 1 seconds INFO: Adding local source files to srctree... INFO: Extracting upgraded version source... INFO: Rebasing devtool onto 3014bb16ebeaee63fee5ced7bf80d4faa9711eb4 WARNING: Command 'git rebase 3014bb16ebeaee63fee5ced7bf80d4faa9711eb4' failed: First, rewinding head to replay your work on top of it... Applying: Makefile: Allow for CC and AR to be overridden Using index info to reconstruct a base tree... M Makefile Falling back to patching base and 3-way merge... Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile error: Failed to merge in the changes. Patch failed at 0001 Makefile: Allow for CC and AR to be overridden 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: Using source tree as build directory since that would be the default for this recipe INFO: Upgraded source extracted to /home/pokybuild/yocto-worker/auh/build/build/build/workspace/sources/rt-tests INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/rt-tests/rt-tests_1.10.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 --===============5937654035091681646==--