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.24163.1608473714054346521 for ; Sun, 20 Dec 2020 06:15:16 -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-3.yocto.io (unknown [172.29.10.57]) by mail.yoctoproject.org (Postfix) with ESMTP id 90AD638C14C6 for ; Sun, 20 Dec 2020 14:15:14 +0000 (UTC) MIME-Version: 1.0 From: auh@auh.yoctoproject.org To: Anuj Mittal Cc: openembedded-core@lists.openembedded.org Subject: [AUH] libva-utils: upgrading to 2.10.0 FAILED Message-ID: Content-Type: multipart/mixed; boundary="===============0628007314788643094==" --===============0628007314788643094== 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 *libva-utils* to *2.10.0* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe libva-utils failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1416 entries from dependency cache. INFO: Extracting current version source... 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-a3cef0e612d52ab715b30b5439bc67fdcb97568a" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:a3cef0e612d52ab715b30b5439bc67fdcb97568a" workspace = "master-next:afec39415be67b6985f0a0c3de041b4f302ffff3" 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: 2 seconds INFO: Extracting upgraded version source... WARNING: Command 'git rebase f112ee75fcd1472131b20f901b93f6ac1d293fad' failed: First, rewinding head to replay your work on top of it... Applying: libva-utils 2.9.0 Using index info to reconstruct a base tree... M configure.ac M meson.build Falling back to patching base and 3-way merge... Auto-merging meson.build CONFLICT (content): Merge conflict in meson.build Auto-merging configure.ac error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 libva-utils 2.9.0 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/libva-utils INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/libva-utils/libva-utils_2.10.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 --===============0628007314788643094==--