From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.yoctoproject.org (mail.yoctoproject.org [198.145.29.25]) by mx.groups.io with SMTP id smtpd.web08.298.1615826520740352861 for ; Mon, 15 Mar 2021 09:42:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: auh.yoctoproject.org, ip: 198.145.29.25, mailfrom: auh@auh.yoctoproject.org) Received: from [172.29.10.111] (unknown [172.29.10.111]) by mail.yoctoproject.org (Postfix) with ESMTP id 2C03B38C11E1 for ; Mon, 15 Mar 2021 16:42:00 +0000 (UTC) MIME-Version: 1.0 From: auh@auh.yoctoproject.org To: =?utf-8?b?QW7DrWJhbCBMaW3Ds24gPGxpbW9uLmFuaWJhbEBnbWFpbC5jb20+?= Cc: openembedded-core@lists.openembedded.org Subject: [AUH] apt: upgrading to 2.2.2 FAILED Message-ID: Content-Type: multipart/mixed; boundary="===============3411771288474652679==" --===============3411771288474652679== 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 *apt* to *2.2.2* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe apt failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1438 entries from dependency cache. INFO: Extracting current version source... INFO: SRC_URI contains some conditional appends/prepends - will create branches to represent these NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.49.2" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.2+snapshot-912eb2a4e82b8517638d3c3593bdff33a2034ea6" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:912eb2a4e82b8517638d3c3593bdff33a2034ea6" workspace = "master:eec64066073428e38d5b0b6947ff302943188f65" Initialising tasks...done. Sstate summary: Wanted 0 Local 0 Network 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: Adding local source files to srctree... INFO: Extracting upgraded version source... INFO: Fetching http://ftp.debian.org/debian/pool/main/a/apt/apt_2.2.2.tar.xz... Loading cache...done. Loaded 1438 entries from dependency cache. Parsing recipes...done. Parsing of 815 .bb files complete (813 cached, 2 parsed). 1439 targets, 31 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.49.2" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.2+snapshot-912eb2a4e82b8517638d3c3593bdff33a2034ea6" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:912eb2a4e82b8517638d3c3593bdff33a2034ea6" workspace = "master:eec64066073428e38d5b0b6947ff302943188f65" Initialising tasks...done. Sstate summary: Wanted 0 Local 0 Network 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: 23% |######## | ETA: 0:00:00 Adding changed files: 47% |################# | ETA: 0:00:00 Adding changed files: 71% |######################### | ETA: 0:00:00 Adding changed files: 94% |################################## | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:00 WARNING: Command 'git rebase 878a1079446bc6efe4398368ebee0b16d62f0585' failed: First, rewinding head to replay your work on top of it... Applying: Disable documentation directory altogether Using index info to reconstruct a base tree... M CMakeLists.txt Falling back to patching base and 3-way merge... Auto-merging CMakeLists.txt Applying: Fix musl build Applying: CMakeLists.txt: avoid changing install paths based on host distro Applying: test/libapt: do not use gtest from the host Using index info to reconstruct a base tree... M test/libapt/CMakeLists.txt Falling back to patching base and 3-way merge... Auto-merging test/libapt/CMakeLists.txt CONFLICT (content): Merge conflict in test/libapt/CMakeLists.txt error: Failed to merge in the changes. Patch failed at 0004 test/libapt: do not use gtest from the host 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/apt INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/apt/apt_2.2.2.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 --===============3411771288474652679==--