texinfo: upgrading to 6.8 FAILED
Hello,
this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *texinfo* to *6.8* has Failed (devtool error).
Detailed error information:
Running 'devtool upgrade' for recipe texinfo failed.
NOTE: Starting bitbake server...
NOTE: Reconnecting to bitbake server...
NOTE: Retrying server connection (#1)... Loading cache...done.
Loaded 1455 entries from dependency cache.
INFO: Extracting current version source... Removing 1 recipes from the x86_64 sysroot...done.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "1.51.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.3+snapshot-b4ebaed949aa3dbef1e2eaac540792c56e6d22e9" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:b4ebaed949aa3dbef1e2eaac540792c56e6d22e9"
workspace = "master:be1cf223bf9c514ee81820ded5b13318458c0daf"
Initialising tasks...done.
Sstate summary: Wanted 0 Local 0 Network 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://ftp.gnu.org/gnu/texinfo/texinfo-6.8.tar.gz...
Loading cache...done.
Loaded 1455 entries from dependency cache.
Parsing recipes...done.
Parsing of 819 .bb files complete (817 cached, 2 parsed). 1456 targets, 32 skipped, 0 masked, 0 errors.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "1.51.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "3.3+snapshot-b4ebaed949aa3dbef1e2eaac540792c56e6d22e9" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:b4ebaed949aa3dbef1e2eaac540792c56e6d22e9"
workspace = "master:be1cf223bf9c514ee81820ded5b13318458c0daf"
Initialising tasks...done.
Sstate summary: Wanted 0 Local 0 Network 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: 3% |# | ETA: 0:00:03 Adding changed files: 6% |## | ETA: 0:00:02 Adding changed files: 9% |### | ETA: 0:00:02 Adding changed files: 12% |#### | ETA: 0:00:02 Adding changed files: 15% |##### | ETA: 0:00:01 Adding changed files: 18% |###### | ETA: 0:00:02 Adding changed files: 21% |####### | ETA: 0:00:02 Adding changed files: 24% |######## | ETA: 0:00:01 Adding changed files: 27% |######### | ETA: 0:00:01 Adding changed files: 30% |########## | ETA: 0:00:01 Adding changed files: 33% |############ | ETA: 0:00:01 Adding changed files: 36% |############# | ETA: 0:00:01 Adding changed files: 39% |############## | ETA: 0:00:01 Adding changed files: 42% |############### | ETA: 0:00:01 Adding changed files: 45% |################ | ETA: 0:00:01 Adding changed files: 48% |################# | ETA: 0:00:01 Adding changed files: 51% |################## | ETA: 0:00:01 Adding changed files: 54% |################### | ETA: 0:00:01 Adding changed files: 57% |#################### | ETA: 0:00:00 Adding changed files: 60% |##################### | ETA: 0:00:00 Adding changed files: 63% |####################### | ETA: 0:00:00 Adding changed files: 66% |######################## | ETA: 0:00:00 Adding changed files: 70% |######################### | ETA: 0:00:00 Adding changed files: 73% |########################## | ETA: 0:00:00 Adding changed files: 76% |########################### | ETA: 0:00:00 Adding changed files: 79% |############################ | ETA: 0:00:00 Adding changed files: 82% |############################# | ETA: 0:00:00 Adding changed files: 85% |############################## | ETA: 0:00:00 Adding changed files: 88% |############################### | ETA: 0:00:00 Adding changed files: 91% |################################ | ETA: 0:00:00 Adding changed files: 94% |################################# | ETA: 0:00:00 Adding changed files: 97% |################################### | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:01 INFO: Rebasing devtool onto 79cd3fd4422b406941274dc3bf37b8534d526d3a WARNING: Command 'git rebase 79cd3fd4422b406941274dc3bf37b8534d526d3a' failed:
First, rewinding head to replay your work on top of it...
Applying: texinfo-4.12-zlib
Using index info to reconstruct a base tree...
M install-info/Makefile.in
M install-info/install-info.c
Falling back to patching base and 3-way merge... Auto-merging install-info/install-info.c
CONFLICT (content): Merge conflict in install-info/install-info.c Auto-merging install-info/Makefile.in
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 texinfo-4.12-zlib
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/texinfo
INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/texinfo/texinfo_6.8.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