kexec-tools: upgrading to 2.0.21 FAILED
Hello,
this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *kexec-tools* to *2.0.21* has Failed (devtool error).
Detailed error information:
Running 'devtool upgrade' for recipe kexec-tools failed.
NOTE: Starting bitbake server...
NOTE: Reconnecting to bitbake server...
NOTE: Previous bitbake instance shutting down?, waiting to retry...
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-8b87497f35d1b299e4b857a86db440fdefc0e536" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:8b87497f35d1b299e4b857a86db440fdefc0e536"
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: Adding local source files to srctree...
INFO: Extracting upgraded version source...
INFO: Fetching https://cdn.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.21.tar.gz...
Loading cache...done.
Loaded 1416 entries from dependency cache.
Parsing recipes...done.
Parsing of 808 .bb files complete (806 cached, 2 parsed). 1417 targets, 31 skipped, 0 masked, 0 errors.
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-8b87497f35d1b299e4b857a86db440fdefc0e536" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:8b87497f35d1b299e4b857a86db440fdefc0e536"
workspace = "master-next:afec39415be67b6985f0a0c3de041b4f302ffff3"
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: 100% |####################################| Time: 0:00:00 WARNING: Command 'git rebase 6134d2fb9a2285817e7370029456c43605ac6a03' failed:
First, rewinding head to replay your work on top of it...
Applying: powerpc: change the memory size limit
Applying: purgatory: Pass -r directly to linker
Applying: kexec: ARM: Fix add_buffer_phys_virt() align issue
Applying: x86_64: Add support to build kexec-tools with x32 ABI Using index info to reconstruct a base tree...
M configure.ac
M kexec/arch/x86_64/kexec-elf-rel-x86_64.c
M kexec/kexec-syscall.h
M purgatory/arch/x86_64/Makefile
Falling back to patching base and 3-way merge...
Auto-merging purgatory/arch/x86_64/Makefile
CONFLICT (content): Merge conflict in purgatory/arch/x86_64/Makefile Auto-merging kexec/kexec-syscall.h
Auto-merging kexec/arch/x86_64/kexec-elf-rel-x86_64.c
CONFLICT (content): Merge conflict in kexec/arch/x86_64/kexec-elf-rel-x86_64.c 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 0004 x86_64: Add support to build kexec-tools with x32 ABI
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/kexec-tools
INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/kexec-tools/kexec-tools_2.0.21.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