To: ['Robert Yang '] To: openembedded-core@lists.openembedded.org Subject: [AUH] time: upgrading to 1.10 FAILED Attachments: Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *time* to *1.10* has Failed (devtool error). Detailed error information: The following devtool command failed: upgrade time -V 1.10 NOTE: Reconnecting to bitbake server... Loading cache...done. Loaded 1976 entries from dependency cache. 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-556d02836d1b2b25cbf6ca64254c9b34fc21bddf" TUNE_FEATURES = "m64 x86-64-v3" meta = "tmp-auh-upgrades:556d02836d1b2b25cbf6ca64254c9b34fc21bddf" meta-yocto-bsp meta-poky = "master:a67ae0e83d8aba0c46cb8383808b2d1203fbb414" 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: 1 seconds Loading cache...done. Loaded 0 entries from dependency cache. Parsing recipes...done. Parsing of 952 .bb files complete (0 cached, 952 parsed). 1977 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-556d02836d1b2b25cbf6ca64254c9b34fc21bddf" TUNE_FEATURES = "m64 x86-64-v3" meta = "tmp-auh-upgrades:556d02836d1b2b25cbf6ca64254c9b34fc21bddf" meta-yocto-bsp meta-poky = "master:a67ae0e83d8aba0c46cb8383808b2d1203fbb414" 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: 1 seconds Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 0% | | ETA: --:--:-- Adding changed files: 35% |############ | ETA: 0:00:00 Adding changed files: 70% |######################### | 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://ftpmirror.gnu.org/gnu/time/time-1.10.tar.gz... INFO: Rebasing devtool onto a78fdffb61069986ab7aee798a1d5891fc4000ba WARNING: Command 'git rebase a78fdffb61069986ab7aee798a1d5891fc4000ba' failed: CONFLICT (modify/delete): src/resuse.c deleted in HEAD and modified in b7dc6b9 (include string.h for memset()). Version b7dc6b9 (include string.h for memset()) of src/resuse.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/resuse.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