Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *lttng-modules* to *2.13.10* has Failed (devtool error).
Detailed error information: The following devtool command failed: upgrade lttng-modules -V 2.13.10 NOTE: Starting bitbake server... NOTE: Reconnecting to bitbake server... NOTE: Retrying server connection (#1)... (15:03:05.806024) WARNING: Host distribution "almalinux-8.8" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution. Loading cache...done. Loaded 1806 entries from dependency cache. Summary: There was 1 WARNING message. WARNING: Host distribution "almalinux-8.8" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.4.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "4.2" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:12a94e38c0fcd9970cd22ef1cfd5c89c2ae79138" workspace = "master:4ddeb8ee8baf964dddf9cf9085d78aa0bf7b28eb" Initialising tasks...done. Sstate summary: Wanted 1 Local 1 Mirrors 0 Missed 0 Current 29 (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: 2 seconds WARNING: Host distribution "almalinux-8.8" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution. Loading cache...done. Loaded 1806 entries from dependency cache. Parsing recipes...done. Parsing of 900 .bb files complete (898 cached, 2 parsed). 1807 targets, 37 skipped, 0 masked, 0 errors. Summary: There was 1 WARNING message. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.4.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" DISTRO = "poky" DISTRO_VERSION = "4.2" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" meta meta-poky meta-yocto-bsp = "tmp-auh-upgrades:12a94e38c0fcd9970cd22ef1cfd5c89c2ae79138" workspace = "master:4ddeb8ee8baf964dddf9cf9085d78aa0bf7b28eb" Initialising tasks...done. Sstate summary: Wanted 1 Local 0 Mirrors 0 Missed 1 Current 0 (0% match, 0% complete) 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: 2 seconds DEBUG 5 [Errno 25] Inappropriate ioctl for device Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 13% |##### | ETA: 0:00:00 Adding changed files: 27% |########## | ETA: 0:00:00 Adding changed files: 41% |############### | ETA: 0:00:00 Adding changed files: 55% |#################### | ETA: 0:00:00 Adding changed files: 69% |######################### | ETA: 0:00:00 Adding changed files: 83% |############################## | ETA: 0:00:00 Adding changed files: 97% |################################### | ETA: 0:00:00 Adding changed files: 100% |####################################| Time: 0:00:00 INFO: Extracting current version source... INFO: Extracting upgraded version source... INFO: Fetching https://lttng.org/files/lttng-modules/lttng-modules-2.13.10.tar.bz2... INFO: Rebasing devtool onto 3e4d6523d852b8291a2a3a3397d3dd85955d196c WARNING: Command 'git rebase 3e4d6523d852b8291a2a3a3397d3dd85955d196c' failed: Auto-merging include/wrapper/genhd.h CONFLICT (rename/rename): include/wrapper/genhd.h renamed to lttng-modules-2.13.10/include/wrapper/genhd.h in HEAD and to lttng-modules-2.13.10/include/wrapper/blkdev.h in b0aa1d4 (Rename genhd wrapper to blkdev). CONFLICT (file location): include/wrapper/genhd.h renamed to include/wrapper/blkdev.h in b0aa1d4 (Rename genhd wrapper to blkdev), inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to lttng-modules-2.13.10/include/wrapper/blkdev.h. ERROR: Execution of 'git checkout devtool' failed with exit code 1: error: you need to resolve your current index first include/wrapper/genhd.h: needs merge lttng-modules-2.13.10/include/wrapper/blkdev.h: needs merge lttng-modules-2.13.10/include/wrapper/genhd.h: 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 (#185328): https://lists.openembedded.org/g/openembedded-core/message/185328 Mute This Topic: https://lists.openembedded.org/mt/100487650/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
