To: ['Ross Burton '] To: openembedded-core@lists.openembedded.org Subject: [AUH] piglit: upgrading to 83c1871bc5936e4a759fa18d43226b122b4cef51 FAILED Attachments: Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *piglit* to *83c1871bc5936e4a759fa18d43226b122b4cef51* has Failed (devtool error). Detailed error information: Running 'devtool upgrade' for recipe piglit failed. 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). 1970 targets, 42 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "2.16.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "x86_64-poky-linux" MACHINE = "qemux86-64" SDKMACHINE = "x86_64" DISTRO = "poky" DISTRO_VERSION = "5.3.99+snapshot-3f582bee4649d514bf760da354409436c9b4fbde" TUNE_FEATURES = "m64 x86-64-v3" meta = "tmp-auh-upgrades:3f582bee4649d514bf760da354409436c9b4fbde" meta-yocto-bsp meta-poky = "master:ac300baea7314ea3c80f2330b2a993f729f32150" workspace = ":" Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing build without monitoring pressure Sstate summary: Wanted 6 Local 6 Mirrors 0 Missed 0 Current 24 (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 INFO: Extracting current version source... INFO: Extracting upgraded version source... INFO: Rebasing devtool onto 83c1871bc5936e4a759fa18d43226b122b4cef51 WARNING: Command 'git rebase 83c1871bc5936e4a759fa18d43226b122b4cef51' failed: Auto-merging tests/util/piglit-test-pattern.cpp CONFLICT (content): Merge conflict in tests/util/piglit-test-pattern.cpp You will need to resolve conflicts in order to complete the upgrade. INFO: Upgraded source extracted to /srv/pokybuild/yocto-worker/auh/build/build/workspace/sources/piglit INFO: New recipe is /srv/pokybuild/yocto-worker/auh/build/build/workspace/recipes/piglit/piglit_git.bb 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