To: ['Chen Qi <Qi.Chen@windriver.com>', 'Viswanath Kraleti <quic_vkraleti@quicinc.com>', 'Chen Qi <Qi.Chen@windriver.com>']
To: openembedded-core@lists.openembedded.org
Subject: [AUH] systemd-boot,systemd-boot-native,systemd: upgrading to 257.1,257.1,257.1 FAILED
Attachments: 

Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe(s) *systemd-boot,systemd-boot-native,systemd* to *257.1,257.1,257.1* has Failed (devtool error).

Detailed error information:

The following devtool command failed:  upgrade systemd-boot -V 257.1 -S 47eea9ee9f46537bc18d6a64fa21fd9c50538e13
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1875 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "2.9.1"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "5.1"
TUNE_FEATURES        = "m64 core2"
TARGET_FPU           = ""
meta                 
meta-poky            
meta-yocto-bsp       
workspace            = "tmp-auh-upgrades:a9e088161678b25d37c177c2bb0d9463fd98b498"

Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure
Sstate summary: Wanted 10 Local 10 Mirrors 0 Missed 0 Current 20 (100% match, 100% complete)
done.
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: 2 seconds

INFO: Extracting current version source...
INFO: Extracting upgraded version source...
INFO: Rebasing devtool onto 47eea9ee9f46537bc18d6a64fa21fd9c50538e13
WARNING: Command 'git rebase 47eea9ee9f46537bc18d6a64fa21fd9c50538e13' failed:
CONFLICT (modify/delete): mkosi.images/system/mkosi.sync deleted in HEAD and modified in 8abb2e0f55 (mkosi: Don't touch the packaging checkout if work is being done).  Version 8abb2e0f55 (mkosi: Don't touch the packaging checkout if work is being done) of mkosi.images/system/mkosi.sync left in tree.

ERROR: Execution of 'git checkout devtool' failed with exit code 1:
error: you need to resolve your current index first
mkosi.images/system/mkosi.sync: needs merge



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