To: ['Chen Qi ', 'Chen Qi ', 'Viswanath Kraleti '] To: openembedded-core@lists.openembedded.org Subject: [AUH] systemd,systemd-boot,systemd-boot-native: upgrading to 257,257,257 FAILED Attachments: Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *systemd,systemd-boot,systemd-boot-native* to *257,257,257* has Failed (devtool error). Detailed error information: The following devtool command failed: upgrade systemd -V 257 -S 70bae7648f2c18010187c9cf20093155eaa26029 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:cc5e3503e4437358efa8c5675e02f5e19430c58f" 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: SRC_URI contains some conditional appends/prepends - will create branches to represent these INFO: Extracting upgraded version source... INFO: Rebasing devtool onto 70bae7648f2c18010187c9cf20093155eaa26029 WARNING: Command 'git rebase 70bae7648f2c18010187c9cf20093155eaa26029' 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. INFO: Rebasing devtool-override-libc-musl onto 70bae7648f2c18010187c9cf20093155eaa26029 ERROR: Execution of 'git checkout devtool-override-libc-musl' 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