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

Hello,

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

Detailed error information:

Running 'devtool upgrade' for recipe systemd-systemctl-native failed.
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 1941 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "2.15.2"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = "5.2.99+snapshot-e4721f0677099c74f0d1635dac7e49570769f763"
TUNE_FEATURES        = "m64 x86-64-v3"
TARGET_FPU           = ""
meta                 = "master:e4721f0677099c74f0d1635dac7e49570769f763"
meta-yocto-bsp       
meta-poky            = "master:fe65e142d0d9ba0e51ff9175ffa82e902f982a20"
workspace            = "<unknown>:<unknown>"

Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure
Sstate summary: Wanted 0 Local 0 Mirrors 0 Missed 0 Current 0 (0% match, 0% complete)
done.
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: 1 seconds
INFO: Extracting current version source...
INFO: Extracting upgraded version source...
INFO: Rebasing devtool onto 67a1069b7269cc23c3d04a2fb0cf110abe7abf31
WARNING: Command 'git rebase 67a1069b7269cc23c3d04a2fb0cf110abe7abf31' failed:
Auto-merging mkosi/mkosi.conf.d/arch/mkosi.conf
Auto-merging mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
Auto-merging mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
Auto-merging mkosi/mkosi.conf.d/opensuse/mkosi.conf
CONFLICT (content): Merge conflict in mkosi/mkosi.conf.d/opensuse/mkosi.conf

You will need to resolve conflicts in order to complete the upgrade.
INFO: Upgraded source extracted to /srv/pokybuild/yocto-worker/auh/build/build/workspace/sources/systemd-systemctl-native
INFO: New recipe is /srv/pokybuild/yocto-worker/auh/build/build/workspace/recipes/systemd-systemctl-native/systemd-systemctl-native_258.1.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