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.12522.1602843683179347150 for ; Fri, 16 Oct 2020 03:21:25 -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 centos8-ty-2.yocto.io (unknown [172.29.10.62]) by mail.yoctoproject.org (Postfix) with ESMTP id 4C1C038C17CB for ; Fri, 16 Oct 2020 03:21:23 -0700 (PDT) MIME-Version: 1.0 From: auh@auh.yoctoproject.org To: Alexander Kanavin Cc: openembedded-core@lists.openembedded.org Subject: [AUH] libsecret: upgrading to 0.20.4 FAILED Message-ID: Content-Type: multipart/mixed; boundary="===============3943622551032071963==" --===============3943622551032071963== 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 *libsecret* to *0.20.4* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe libsecret failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1499 entries from dependency cache. INFO: Extracting current version source... 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:d2b7b61a06ec98b048010dfeb9ad32dadadf8c28" 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://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.4.tar.xz;name=archive... Loading cache...done. Loaded 1499 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:d2b7b61a06ec98b048010dfeb9ad32dadadf8c28" 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: 3 seconds DEBUG 5 [Errno 25] Inappropriate ioctl for device Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 100% |####################################| Time: 0:00:00 WARNING: Command 'git rebase cc5000001853dc09b5df0899b2b69ef4615dade6' failed: First, rewinding head to replay your work on top of it... Applying: meson: add option introspection Using index info to reconstruct a base tree... M libsecret/meson.build M meson.build M meson_options.txt Falling back to patching base and 3-way merge... Auto-merging meson.build CONFLICT (content): Merge conflict in meson.build Auto-merging libsecret/meson.build CONFLICT (content): Merge conflict in libsecret/meson.build error: Failed to merge in the changes. Patch failed at 0001 meson: add option introspection 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/libsecret INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/libsecret/libsecret_0.20.4.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 --===============3943622551032071963==--