To: ['Richard Purdie ', 'Richard Purdie ', 'Richard Purdie '] To: openembedded-core@lists.openembedded.org Subject: [AUH] lttng-tools,lttng-modules,lttng-ust: upgrading to 2.15.1,2.15.1,2.15.1 FAILED Attachments: Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *lttng-tools,lttng-modules,lttng-ust* to *2.15.1,2.15.1,2.15.1* has Failed (devtool error). Detailed error information: The following devtool command failed: upgrade lttng-tools -V 2.15.1 NOTE: Reconnecting to bitbake server... Loading cache...done. Loaded 0 entries from dependency cache. Parsing recipes...done. Parsing of 951 .bb files complete (0 cached, 951 parsed). 1980 targets, 40 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.19.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" SDKMACHINE = "x86_64" DISTRO = "poky" DISTRO_VERSION = "6.0.99+snapshot-97ff9c42ed8c561ea08a3bd87c8612f251f56432" TUNE_FEATURES = "m64 x86-64-v3" meta = "tmp-auh-upgrades:97ff9c42ed8c561ea08a3bd87c8612f251f56432" meta-yocto-bsp meta-poky = "master:59c41245ad231f5320defcb275477e3d25a2203e" workspace = ":" 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 Loading cache...done. Loaded 0 entries from dependency cache. Parsing recipes...done. Parsing of 952 .bb files complete (0 cached, 952 parsed). 1981 targets, 40 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.19.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" SDKMACHINE = "x86_64" DISTRO = "poky" DISTRO_VERSION = "6.0.99+snapshot-97ff9c42ed8c561ea08a3bd87c8612f251f56432" TUNE_FEATURES = "m64 x86-64-v3" meta = "tmp-auh-upgrades:97ff9c42ed8c561ea08a3bd87c8612f251f56432" meta-yocto-bsp meta-poky = "master:59c41245ad231f5320defcb275477e3d25a2203e" workspace = ":" Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure Sstate summary: Wanted 1 Local 0 Mirrors 0 Missed 1 Current 0 (0% match, 0% complete) done. 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 Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 10% |### | ETA: 0:00:00 Adding changed files: 21% |####### | ETA: 0:00:00 Adding changed files: 32% |########### | ETA: 0:00:00 Adding changed files: 43% |############### | ETA: 0:00:00 Adding changed files: 53% |################### | ETA: 0:00:00 Adding changed files: 64% |####################### | ETA: 0:00:00 Adding changed files: 75% |########################### | ETA: 0:00:00 Adding changed files: 86% |############################### | 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-tools/lttng-tools-2.15.1.tar.bz2... INFO: Rebasing devtool onto c10ee5ee0de8f96347eacff2456e290dc45c4e67 WARNING: Command 'git rebase c10ee5ee0de8f96347eacff2456e290dc45c4e67' failed: CONFLICT (modify/delete): tests/utils/testapp/userspace-probe-elf-binary/Makefile.am deleted in HEAD and modified in d4d7ee3 (tests: do not strip a helper library). Version d4d7ee3 (tests: do not strip a helper library) of tests/utils/testapp/userspace-probe-elf-binary/Makefile.am left in tree. ERROR: Execution of 'git checkout devtool' failed with exit code 1: error: you need to resolve your current index first tests/utils/testapp/userspace-probe-elf-binary/Makefile.am: 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