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.web12.39170.1605551303643781911 for ; Mon, 16 Nov 2020 10:28:24 -0800 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 debian10-ty-2.yocto.io (unknown [172.29.10.56]) by mail.yoctoproject.org (Postfix) with ESMTP id 228C138C11DE for ; Mon, 16 Nov 2020 18:28:23 +0000 (UTC) MIME-Version: 1.0 From: auh@auh.yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] meson: upgrading to 0.56.0 FAILED Message-ID: Content-Type: multipart/mixed; boundary="===============2372054267336479285==" --===============2372054267336479285== 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 *meson* to *0.56.0* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe meson failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1394 entries from dependency cache. INFO: Extracting current version source... INFO: SRC_URI contains some conditional appends/prepends - will create branches to represent these 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-20201116" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:44f5e8796921a78d0c7047e35cbc7477893d0c2e" workspace = "master:aaf6aa3e530deb4a8d818a55a37b9029980b0b0d" Initialising tasks...done. Sstate summary: Wanted 0 Found 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: Extracting upgraded version source... INFO: Fetching https://github.com/mesonbuild/meson/releases/download/0.56.0/meson-0.56.0.tar.gz... Loading cache...done. Loaded 1394 entries from dependency cache. Parsing recipes...done. Parsing of 792 .bb files complete (790 cached, 2 parsed). 1373 targets, 35 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-20201116" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:44f5e8796921a78d0c7047e35cbc7477893d0c2e" workspace = "master:aaf6aa3e530deb4a8d818a55a37b9029980b0b0d" Initialising tasks...done. Sstate summary: Wanted 0 Found 0 Missed 0 Current 0 (0% match, 0% complete) NOTE: No setscene tasks NOTE: Executing Tasks NOTE: Tasks Summary: Attempted 2 tasks of which 0 didn't need to be rerun and all succeeded. NOTE: Writing buildhistory NOTE: Writing buildhistory took: 1 seconds DEBUG 5 [Errno 25] Inappropriate ioctl for device Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 20% |####### | ETA: 0:00:00 Adding changed files: 41% |############## | ETA: 0:00:00 Adding changed files: 61% |###################### | ETA: 0:00:00 Adding changed files: 82% |############################# | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:00 WARNING: Command 'git rebase c14d13a9f5213dbe3fba42bd76e5075eec18b1e8' failed: First, rewinding head to replay your work on top of it... Applying: gtkdoc: fix issues that arise when cross-compiling Applying: native_bindir Using index info to reconstruct a base tree... M mesonbuild/dependencies/base.py M mesonbuild/dependencies/ui.py Falling back to patching base and 3-way merge... Auto-merging mesonbuild/dependencies/ui.py Auto-merging mesonbuild/dependencies/base.py CONFLICT (content): Merge conflict in mesonbuild/dependencies/base.py error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 native_bindir 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/meson INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/meson/meson_0.56.0.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 --===============2372054267336479285==--