Re: [PATCH 1/2] qemu: upgrade to 2.10.1

[Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 3369 bytes --]

Hi Patrick

On Thu, Oct 26, 2017 at 4:33 AM, Patrick Ohly <patrick.ohly@intel.com> 
wrote:
> On Thu, 2017-10-19 at 13:10 -0700,
> leonardo.sandoval.gonzalez@linux.intel.com wrote:
>>  From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
>> 
>>  All CVE patches removed because these are already integrated in
>>  2.10.1.
> ...
>>   meta/recipes-devtools/qemu/qemu/glibc-2.25.patch   |  14 -
> diff --git a/meta/recipes-devtools/qemu/qemu/glibc-2.25.patch
>>  b/meta/recipes-devtools/qemu/qemu/glibc-2.25.patch
>>  index a6908bdbf9..25569449e4 100644
>>  --- a/meta/recipes-devtools/qemu/qemu/glibc-
>>  2.25.patch
>>  +++ b/meta/recipes-devtools/qemu/qemu/glibc-2.25.patch
>>  @@ -72,17 +72,3 @@ diff -uNr qemu-2.8.0.orig/configure qemu-
>>  2.8.0/configure
>>    # Hold two types of flag:
>>    #   CONFIG_THREAD_SETNAME_BYTHREAD  - we've got a way of setting
>>  the name on
>>    #                                     a thread we have a handle to
>>  -diff -uNr qemu-2.8.0.orig/include/sysemu/os-posix.h qemu-
>>  2.8.0/include/sysemu/os-posix.h
>>  ---- qemu-2.8.0.orig/include/sysemu/os-posix.h	2016-12-20
>>  21:16:48.000000000 +0100
>>  -+++ qemu-2.8.0/include/sysemu/os-posix.h	2017-02-21
>>  19:07:18.009090381 +0100
>>  -@@ -34,6 +34,10 @@
>>  - #include <netdb.h>
>>  - #include <sys/un.h>
>>  -
>>  -+#ifdef CONFIG_SYSMACROS
>>  -+#include <sys/sysmacros.h>
>>  -+#endif
>>  -+
>>  - void os_set_line_buffering(void);
>>  - void os_set_proc_name(const char *s);
>>  - void os_setup_signal_handling(void);
> 
> Instead of removing just this hunk from the glibc-2.25.patch, please
> remove the entire patch. It is already in 2.10.0.
> 
> I was about to send a patch doing just that when I saw your version
> update. Here's the commit message for my patch:
> 
>     The patch is already present in the upstream 2.10.0. Patching 
> during a
>     build succeeds by adding the same hunks again to configure (which
>     seems to cause no problems during build) and skipping the one 
> which it
>     detects as already applied, but "devtool modify qemu-native" is 
> more
>     picky:

I used devtool upgrade and the only hunk I need to remove was this one, 
the rest were applied cleanly. Let me check again and send  a V2 asap.

Leo


> 
> 
>     ERROR: Applying 'glibc-2.25.patch' failed:
>     checking file configure
>     Hunk #1 succeeded at 4986 with fuzz 2 (offset 259 lines).
>     checking file configure
>     Hunk #1 succeeded at 6047 with fuzz 1 (offset 352 lines).
>     checking file include/sysemu/os-posix.h
>     Reversed (or previously applied) patch detected!  Assume -R? [n]
>     Apply anyway? [n]
>     Skipping patch.
>     1 out of 1 hunk ignored
>     ERROR: Function failed: patch_do_patch
>     ERROR: Logfile of failure stored in: 
> .../devtooltmp-6_22hcm3/temp/log.do_patch.31897
>     NOTE: Tasks Summary: Attempted 3 tasks of which 0 didn't need to 
> be rerun and 1 failed.
>     ERROR: Extracting source for qemu-native failed
> 
> --
> Best Regards, Patrick Ohly
> 
> The content of this message is my personal opinion only and although
> I am an employee of Intel, the statements I make here in no way
> represent Intel's position on the issue, nor am I authorized to speak
> on behalf of Intel on this matter.
> 
> 

[-- Attachment #2: Type: text/html, Size: 4329 bytes --]