[OE-core] [AUH] kmscube: upgrading to a12e306ce18ff1c2922219a5342fa419ee80a12e FAILED

[Carlos Rafael Giani]

I noticed this already, yes. Working on it.

On 17.07.19 15:47, auh at auh.yoctoproject.org wrote:
> Hello,
>
> You are receiving this email because you are the maintainer
> of *kmscube* recipe and this is to let you know that the automatic attempt
> to upgrade the recipe to *a12e306ce18ff1c2922219a5342fa419ee80a12e* has Failed (devtool error).
>
> Detailed error information:
>
> Running 'devtool upgrade' for recipe kmscube failed.
> NOTE: Starting bitbake server...
> NOTE: Bitbake server didn't start within 5 seconds, waiting for 90
> NOTE: Reconnecting to bitbake server...
> NOTE: Retrying server connection (#1)...
> WARNING: Layer workspacelayer should set LAYERSERIES_COMPAT_workspacelayer in its conf/layer.conf file to list the core layer names it is compatible with.
> Loading cache...done.
> INFO: Extracting current version source...
> Loaded 1324 entries from dependency cache.
>
> Summary: There was 1 WARNING message shown.
> NOTE: Resolving any missing task queue dependencies
>
> Build Configuration:
> BB_VERSION           = "1.43.0"
> BUILD_SYS            = "x86_64-linux"
> NATIVELSBSTRING      = "universal"
> TARGET_SYS           = "i686-poky-linux"
> MACHINE              = "qemux86"
> DISTRO               = "poky"
> DISTRO_VERSION       = "2.7+snapshot-20190716"
> TUNE_FEATURES        = "m32 core2"
> TARGET_FPU           = ""
> meta
> meta-poky
> meta-yocto-bsp       = "tmp-auh-upgrades:d1d025cb80e75952d4a8c5e0e5d44ca6d9716b5a"
> workspace            = "<unknown>:<unknown>"
>
> Initialising tasks...NOTE: No setscene tasks
> NOTE: Executing Tasks
> NOTE: Tasks Summary: Attempted 3 tasks of which 0 didn't need to be rerun and all succeeded.
> NOTE: Writing buildhistory
> NOTE: Writing buildhistory took: 2 seconds
> INFO: Extracting upgraded version source...
> WARNING: Command 'git rebase a12e306ce18ff1c2922219a5342fa419ee80a12e' failed:
> First, rewinding head to replay your work on top of it...
> Applying: Detect gst_bo_map/_unmap and use it (or avoid it)
> Using index info to reconstruct a base tree...
> M	Makefile.am
> M	kmscube.c
> Falling back to patching base and 3-way merge...
> Auto-merging kmscube.c
> Auto-merging Makefile.am
> CONFLICT (content): Merge conflict in Makefile.am
> error: Failed to merge in the changes.
> Patch failed at 0001 Detect gst_bo_map/_unmap and use it (or avoid it)
> The copy of the patch that failed is found in: .git/rebase-apply/patch
>
> When you have resolved this problem, run "git rebase --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase --abort".
>
> You will need to resolve conflicts in order to complete the upgrade.
> INFO: Upgraded source extracted to /home/auh/build/workspace/sources/kmscube
> INFO: New recipe is /home/auh/build/workspace/recipes/kmscube/kmscube_git.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