Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *systemd-boot* to *253* has Failed (devtool error).
Detailed error information: The following devtool command failed: upgrade systemd-boot -V 253 -S 477fdc5afed0457c43d01f3d7ace7209f81d3995 NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... (07:32:42.457174) Loading cache...done. Loaded 1697 entries from dependency cache. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.3.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "4.1+snapshot-0a96198be305e9ef9e7af2fbec88d3cc64d5a831" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:0a96198be305e9ef9e7af2fbec88d3cc64d5a831" workspace = "master:33d9b3a8ed186c2d212acb83f715367912010e7f" Initialising tasks...done. Sstate summary: Wanted 0 Local 0 Mirrors 0 Missed 0 Current 20 (0% match, 100% complete) NOTE: Executing Tasks NOTE: Tasks Summary: Attempted 93 tasks of which 90 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 477fdc5afed0457c43d01f3d7ace7209f81d3995 WARNING: Command 'git rebase 477fdc5afed0457c43d01f3d7ace7209f81d3995' failed: Auto-merging docs/ENVIRONMENT.md CONFLICT (modify/delete): src/basic/util.c deleted in HEAD and modified in 83a772aae2 (Revert "initrd: extend SYSTEMD_IN_INITRD to accept non-ramfs rootfs"). Version 83a772aae2 (Revert "initrd: extend SYSTEMD_IN_INITRD to accept non-ramfs rootfs") of src/basic/util.c left in tree. ERROR: Execution of 'git checkout devtool' failed with exit code 1: error: you need to resolve your current index first src/basic/util.c: 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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#177896): https://lists.openembedded.org/g/openembedded-core/message/177896 Mute This Topic: https://lists.openembedded.org/mt/97316150/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
