[OE-core] [AUH] xev: upgrading to 1.2.3 FAILED

[akuster808]

On 3/17/19 4:33 AM, auh at auh.yoctoproject.org wrote:
> Hello,
>
> You are receiving this email because you are the maintainer
> of *xev* recipe and this is to let you know that the automatic attempt
> to upgrade the recipe to *1.2.3* has Failed (devtool error).
>
> Detailed error information:

in master-next.


>
> Running 'devtool upgrade' for recipe xev failed.
> NOTE: Starting bitbake server...
> NOTE: Bitbake server didn't start within 5 seconds, waiting for 90
> 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 1303 entries from dependency cache.
>
> Summary: There was 1 WARNING message shown.
> NOTE: Resolving any missing task queue dependencies
>
> Build Configuration:
> BB_VERSION           = "1.40.0"
> BUILD_SYS            = "x86_64-linux"
> NATIVELSBSTRING      = "universal"
> TARGET_SYS           = "i586-poky-linux"
> MACHINE              = "qemux86"
> DISTRO               = "poky"
> DISTRO_VERSION       = "2.6+snapshot-20190317"
> TUNE_FEATURES        = "m32 i586"
> TARGET_FPU           = ""
> meta                 
> meta-poky            
> meta-yocto-bsp       = "tmp-auh-upgrades:9fba148a53f70ffa1ec93098be636ef1fe3aa6de"
> workspace            = "<unknown>:<unknown>"
>
> Initialising tasks...done.
> NOTE: Executing RunQueue Tasks
> NOTE: Tasks Summary: Attempted 3 tasks of which 0 didn't need to be rerun and all succeeded.
> NOTE: Writing buildhistory
> INFO: Extracting upgraded version source...
> INFO: Fetching http://xorg.freedesktop.org/releases/individual/app/xev-1.2.3.tar.bz2...
> Loading cache...done.
> Loaded 1303 entries from dependency cache.
> Parsing recipes...done.
> Parsing of 786 .bb files complete (784 cached, 2 parsed). 1304 targets, 35 skipped, 0 masked, 0 errors.
> NOTE: Resolving any missing task queue dependencies
>
> Build Configuration:
> BB_VERSION           = "1.40.0"
> BUILD_SYS            = "x86_64-linux"
> NATIVELSBSTRING      = "universal"
> TARGET_SYS           = "i586-poky-linux"
> MACHINE              = "qemux86"
> DISTRO               = "poky"
> DISTRO_VERSION       = "2.6+snapshot-20190317"
> TUNE_FEATURES        = "m32 i586"
> TARGET_FPU           = ""
> meta                 
> meta-poky            
> meta-yocto-bsp       = "tmp-auh-upgrades:9fba148a53f70ffa1ec93098be636ef1fe3aa6de"
> workspace            = "<unknown>:<unknown>"
>
> Initialising tasks...done.
> NOTE: Executing RunQueue Tasks
> NOTE: Tasks Summary: Attempted 2 tasks of which 0 didn't need to be rerun and all succeeded.
> NOTE: Writing buildhistory
> 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 c7c29d114756ad26881755b75dfc839ac37692ab' failed:
> First, rewinding head to replay your work on top of it...
> Applying: Add xev
> Using index info to reconstruct a base tree...
> M	xev.c
> Falling back to patching base and 3-way merge...
> Auto-merging xev.c
> CONFLICT (content): Merge conflict in xev.c
> error: Failed to merge in the changes.
> Patch failed at 0001 Add xev
> 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/xev
> INFO: New recipe is /home/auh/build/workspace/recipes/xev/xev_1.2.3.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