strace: upgrading to 5.10 FAILED
Hello,
this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *strace* to *5.10* has Failed (devtool error).
Detailed error information:
Running 'devtool upgrade' for recipe strace failed.
NOTE: Starting bitbake server...
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-28fbc54e69b7387eb622353e7574acae5909fd87" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:28fbc54e69b7387eb622353e7574acae5909fd87"
workspace = "master-next:afec39415be67b6985f0a0c3de041b4f302ffff3"
Initialising tasks...done.
Sstate summary: Wanted 0 Found 0 Missed 0 Current 22 (0% match, 100% complete)
NOTE: Executing Tasks
NOTE: Tasks Summary: Attempted 102 tasks of which 99 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...
INFO: Fetching https://strace.io/files/5.10/strace-5.10.tar.xz...
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-28fbc54e69b7387eb622353e7574acae5909fd87" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:28fbc54e69b7387eb622353e7574acae5909fd87"
workspace = "master-next:afec39415be67b6985f0a0c3de041b4f302ffff3"
Initialising tasks...done.
Sstate summary: Wanted 0 Found 0 Missed 0 Current 18 (0% match, 100% complete)
NOTE: Executing Tasks
NOTE: Tasks Summary: Attempted 83 tasks of which 81 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: 31% |########### | ETA: 0:00:00 Adding changed files: 63% |####################### | ETA: 0:00:00 Adding changed files: 95% |################################## | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:00 WARNING: Command 'git rebase 48dab811de74c7a39242e772673a46cd91c5b97c' failed:
First, rewinding head to replay your work on top of it...
Applying: strace: remove need for scripts
Applying: update gawk paths, /bin/gawk -> /usr/bin/gawk
Applying: strace: Add ptest
Applying: strace: Fix build with mips/mips64 on musl
Applying: caps-abbrev.awk: fix gawk's path
Applying: strace: Tweak ptest disk space management
Applying: include stdint.h for getting uintptr_t definition
Applying: strace: fix reproducibilty issues
Applying: xlat: Mark IPPROTO_MAX last in IPPROTO_* constants Using index info to reconstruct a base tree...
M xlat/inet_protocols.h
M xlat/inet_protocols.in
Falling back to patching base and 3-way merge... Auto-merging xlat/inet_protocols.in
Auto-merging xlat/inet_protocols.h
CONFLICT (content): Merge conflict in xlat/inet_protocols.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0009 xlat: Mark IPPROTO_MAX last in IPPROTO_* constants
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/strace
INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/strace/strace_5.10.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