- workaround <sys/xattr.h> vs <linux/xattr.h> conflict

diff --git a/xen-xattr.patch b/xen-xattr.patch
new file mode 100644 (file)
index 0000000..91abad2
--- /dev/null
+++ b/xen-xattr.patch
@@ -0,0 +1,23 @@
+Workaround <linux/xattr.h> vs <sys/xattr.h> defines conflict:
+When including both, the latter must be included first.
+Move "qemu-xattr.h" (which includes <sys/xattr.h> to the front,
+before <sys/capability.h> (which includes <linux/xattr.h>.
+
+--- xen-4.3.2/tools/qemu-xen/fsdev/virtfs-proxy-helper.c.orig  2013-10-10 16:20:18.000000000 +0200
++++ xen-4.3.2/tools/qemu-xen/fsdev/virtfs-proxy-helper.c       2014-02-24 11:31:45.912924912 +0100
+@@ -9,6 +9,7 @@
+  * the COPYING file in the top-level directory.
+  */
+ 
++#include "qemu-xattr.h"
+ #include <sys/resource.h>
+ #include <getopt.h>
+ #include <syslog.h>
+@@ -22,7 +23,6 @@
+ #endif
+ #include "qemu-common.h"
+ #include "qemu_socket.h"
+-#include "qemu-xattr.h"
+ #include "virtio-9p-marshal.h"
+ #include "hw/9pfs/virtio-9p-proxy.h"
+ #include "fsdev/virtio-9p-marshal.h"

diff --git a/xen.spec b/xen.spec
index 1965cf56ae462a762d8b1453ef86df0ffe64c6f9..2c67d0dd1245934e978e56093e3bd98d87283e60 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -114,6 +114,7 @@ Patch11:    %{name}-ulong.patch
 Patch12:       %{name}-doc.patch
 Patch13:       %{name}-paths.patch
 Patch14:       %{name}-no_fetcher.patch
+Patch15:       %{name}-xattr.patch
 URL:           http://www.xen.org/products/xenhyp.html
 %{?with_opengl:BuildRequires:  OpenGL-devel}
 %{?with_sdl:BuildRequires:     SDL-devel >= 1.2.1}
@@ -410,6 +411,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # stubdom sources
 ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom