m4: upgrading to 1.4.19 FAILED
Hello,
this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *m4* to *1.4.19* has Failed (devtool error).
Detailed error information:
Running 'devtool upgrade' for recipe m4 failed.
NOTE: Starting bitbake server...
NOTE: Reconnecting to bitbake server...
NOTE: Retrying server connection (#1)...
Loading cache...done.
Loaded 1452 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.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-4565d06df739cc72e2b33833e54fab86b2836758" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:4565d06df739cc72e2b33833e54fab86b2836758"
workspace = "master:ae7595a603f3fea1750f3f170e0e7c8098a352c7"
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: Adding local source files to srctree...
INFO: Extracting upgraded version source...
INFO: Fetching https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.gz...
Loading cache...done.
Loaded 1452 entries from dependency cache.
Parsing recipes...done.
Parsing of 817 .bb files complete (815 cached, 2 parsed). 1453 targets, 31 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-4565d06df739cc72e2b33833e54fab86b2836758" TUNE_FEATURES = "m64 core2" TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "tmp-auh-upgrades:4565d06df739cc72e2b33833e54fab86b2836758"
workspace = "master:ae7595a603f3fea1750f3f170e0e7c8098a352c7"
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: 6% |## | ETA: 0:00:01 Adding changed files: 12% |#### | ETA: 0:00:00 Adding changed files: 18% |###### | ETA: 0:00:00 Adding changed files: 24% |######## | ETA: 0:00:00 Adding changed files: 30% |########## | ETA: 0:00:00 Adding changed files: 36% |############# | ETA: 0:00:00 Adding changed files: 42% |############### | ETA: 0:00:00 Adding changed files: 48% |################# | ETA: 0:00:00 Adding changed files: 54% |################### | ETA: 0:00:00 Adding changed files: 60% |##################### | ETA: 0:00:00 Adding changed files: 66% |######################## | ETA: 0:00:00 Adding changed files: 72% |########################## | ETA: 0:00:00 Adding changed files: 78% |############################ | ETA: 0:00:00 Adding changed files: 84% |############################## | ETA: 0:00:00 Adding changed files: 91% |################################ | ETA: 0:00:00 Adding changed files: 97% |################################## | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:00 WARNING: Command 'git rebase 1c32ef972a2c08cb84856aad734259a4512f6108' failed:
First, rewinding head to replay your work on top of it...
Applying: m4-native: Fix building on Ubuntu 9.10 Using index info to reconstruct a base tree...
M configure
Falling back to patching base and 3-way merge... Auto-merging configure
CONFLICT (content): Merge conflict in configure
error: Failed to merge in the changes.
Patch failed at 0001 m4-native: Fix building on Ubuntu 9.10 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/m4
INFO: New recipe is /home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/m4/m4_1.4.19.bb
INFO: License checksums have been updated in the new recipe; please refer to it for the difference between the old and the new license texts.
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