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.23993.1608473714081492818 for ; Sun, 20 Dec 2020 06:15:14 -0800 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 debian10-ty-3.yocto.io (unknown [172.29.10.57]) by mail.yoctoproject.org (Postfix) with ESMTP id 8ECC538C13A2 for ; Sun, 20 Dec 2020 14:15:13 +0000 (UTC) MIME-Version: 1.0 From: auh@auh.yoctoproject.org To: Chen Qi Cc: openembedded-core@lists.openembedded.org Subject: [AUH] systemd: upgrading to 247.2 FAILED Message-ID: Content-Type: multipart/mixed; boundary="===============4847341021600290015==" --===============4847341021600290015== 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 *systemd* to *247.2* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe systemd failed. NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... Loading cache...done. Loaded 1414 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.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.2+snapshot-203325fe75f4b3396a57bb38fe94bb72190a57f8" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:203325fe75f4b3396a57bb38fe94bb72190a57f8" 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: 1 seconds INFO: Adding local source files to srctree... INFO: Extracting upgraded version source... WARNING: Command 'git rebase 937118a5b2f27a7913c421ad76893cdda01c5566' failed: First, rewinding head to replay your work on top of it... Applying: network: wait for previous address removal before configuring static addresses Using index info to reconstruct a base tree... M src/network/networkd-link.c M src/network/networkd-link.h Falling back to patching base and 3-way merge... Auto-merging src/network/networkd-link.h Auto-merging src/network/networkd-link.c CONFLICT (content): Merge conflict in src/network/networkd-link.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 network: wait for previous address removal before configuring static addresses 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/systemd INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/systemd/systemd_247.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 --===============4847341021600290015==--