Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *repo* to *2.39* has Failed 
(devtool error).

Detailed error information:

Running 'devtool upgrade' for recipe repo failed.
NOTE: Starting bitbake server...
NOTE: Reconnecting to bitbake server...
NOTE: Retrying server connection (#1)... (09:44:40.779371)
Loading cache...done.
Loaded 1843 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "2.6.0"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "4.3+snapshot-6e38f57c8f0bc68ea564765af10ac63d64160ab3"
TUNE_FEATURES        = "m64 core2"
TARGET_FPU           = ""
meta                 
meta-poky            
meta-yocto-bsp       = 
"tmp-auh-upgrades:6e38f57c8f0bc68ea564765af10ac63d64160ab3"
workspace            = "master:3a7b408178439482d49d573113cc61a69fb28147"

Initialising tasks...done.
Sstate summary: Wanted 2 Local 2 Mirrors 0 Missed 0 Current 28 (100% match, 
100% complete)
NOTE: Executing Tasks
NOTE: Tasks Summary: Attempted 103 tasks of which 100 didn't need to be rerun 
and all succeeded.
NOTE: Writing buildhistory
NOTE: Writing buildhistory took: 1 seconds
INFO: Extracting current version source...
INFO: Extracting upgraded version source...
INFO: Rebasing devtool onto b99272c601bc5f466c3cfc782bb852c2c967ad27
WARNING: Command 'git rebase b99272c601bc5f466c3cfc782bb852c2c967ad27' failed:
Auto-merging repo
CONFLICT (content): Merge conflict in repo

You will need to resolve conflicts in order to complete the upgrade.
INFO: Using source tree as build directory since that would be the default for 
this recipe
INFO: Upgraded source extracted to 
/home/pokybuild/yocto-worker/auh/build/build/build/workspace/sources/repo
INFO: New recipe is 
/home/pokybuild/yocto-worker/auh/build/build/build/workspace/recipes/repo/repo_2.39.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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189961): 
https://lists.openembedded.org/g/openembedded-core/message/189961
Mute This Topic: https://lists.openembedded.org/mt/102320337/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to