[AUH] elfutils: upgrading to 0.183 FAILED

[AUH] elfutils: upgrading to 0.183 FAILED

[auh]

[-- Attachment #1: Type: text/plain, Size: 5485 bytes --]

Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *elfutils* to *0.183* has Failed (devtool error).

Detailed error information:

Running 'devtool upgrade' for recipe elfutils failed.
NOTE: Starting bitbake server...
NOTE: Reconnecting to bitbake server...
NOTE: Retrying server connection (#1)...
Loading cache...done.
Loaded 1428 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.1"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "3.2+snapshot-ec5fe82cc2f0991530ba1bb0c9203674cfe95f44"
TUNE_FEATURES        = "m64 core2"
TARGET_FPU           = ""
meta                 
meta-poky            
meta-yocto-bsp       = "tmp-auh-upgrades:ec5fe82cc2f0991530ba1bb0c9203674cfe95f44"
workspace            = "master:6b24d3fc583a87fb4284ce00256e8069345c9f3a"

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: Adding local source files to srctree...
INFO: Extracting upgraded version source...
INFO: Fetching https://sourceware.org/elfutils/ftp/0.183/elfutils-0.183.tar.bz2...
Loading cache...done.
Loaded 1428 entries from dependency cache.
Parsing recipes...done.
Parsing of 811 .bb files complete (809 cached, 2 parsed). 1429 targets, 31 skipped, 0 masked, 0 errors.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "1.49.1"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "3.2+snapshot-ec5fe82cc2f0991530ba1bb0c9203674cfe95f44"
TUNE_FEATURES        = "m64 core2"
TARGET_FPU           = ""
meta                 
meta-poky            
meta-yocto-bsp       = "tmp-auh-upgrades:ec5fe82cc2f0991530ba1bb0c9203674cfe95f44"
workspace            = "master:6b24d3fc583a87fb4284ce00256e8069345c9f3a"

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: 2 seconds
DEBUG 5 [Errno 25] Inappropriate ioctl for device
Adding changed files:   0% |                                   | ETA:  --:--:--
Adding changed files:   0% |                                   | ETA:  --:--:--
Adding changed files:  47% |#################                   | ETA:  0:00:00
Adding changed files:  95% |##################################  | ETA:  0:00:00
Adding changed files: 100% |####################################| Time: 0:00:00
WARNING: Command 'git rebase b426a9d446ff60c743cb20732de6f2dcc7d633cb' failed:
First, rewinding head to replay your work on top of it...
Applying: dso link change
Applying: Fix elf_cvt_gunhash if dest and src are same.
Applying: fixheadercheck
Applying: Disable the test to convert euc-jp
Using index info to reconstruct a base tree...
M	m4/iconv.m4
Falling back to patching base and 3-way merge...
Auto-merging m4/iconv.m4
Applying: Fix build on aarch64/musl
Applying: libasm may link with libbz2 if found
Applying: libelf/elf_end.c: check data_list.data.d.d_buf before free it
Applying: skip the test when gcc not deployed
Using index info to reconstruct a base tree...
M	tests/run-disasm-x86-64.sh
M	tests/run-disasm-x86.sh
M	tests/run-strip-g.sh
M	tests/run-strip-nothing.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/run-strip-nothing.sh
Auto-merging tests/run-strip-g.sh
Auto-merging tests/run-disasm-x86.sh
CONFLICT (content): Merge conflict in tests/run-disasm-x86.sh
Auto-merging tests/run-disasm-x86-64.sh
CONFLICT (content): Merge conflict in tests/run-disasm-x86-64.sh
error: Failed to merge in the changes.
Patch failed at 0008 skip the test when gcc not deployed
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", 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/elfutils
INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/elfutils/elfutils_0.183.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