- added ulong patch (one more build fix for current glibc/linux)

- release 2

diff --git a/xen-ulong.patch b/xen-ulong.patch
new file mode 100644 (file)
index 0000000..9842e65
--- /dev/null
+++ b/xen-ulong.patch
@@ -0,0 +1,20 @@
+--- xen-4.2.1/tools/debugger/gdbsx/xg/xg_main.c.orig   2012-12-17 16:00:22.000000000 +0100
++++ xen-4.2.1/tools/debugger/gdbsx/xg/xg_main.c        2013-01-13 08:38:22.865825568 +0100
+@@ -178,7 +178,7 @@
+     hypercall.op = __HYPERVISOR_domctl;
+     hypercall.arg[0] = (unsigned long)&domctl;
+ 
+-    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (ulong)&hypercall);
++    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (unsigned long)&hypercall);
+     if (domctlarg && sz)
+         munlock(domctlarg, sz);
+     return rc;
+@@ -218,7 +218,7 @@
+     hypercall.arg[0] = (unsigned long)XENVER_capabilities;
+     hypercall.arg[1] = (unsigned long)&xen_caps;
+ 
+-    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (ulong)&hypercall);
++    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (unsigned long)&hypercall);
+     munlock(&xen_caps, sizeof(xen_caps));
+     XGTRC("XENCAPS:%s\n", xen_caps);
+ 

diff --git a/xen.spec b/xen.spec
index 6e1433af669703ac3b5c01158f4f419e36257d77..287ab6b72a16b60dc9f42cb51e62d712afdb5e17 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -30,7 +30,7 @@ Summary:      Xen - a virtual machine monitor
 Summary(pl.UTF-8):     Xen - monitor maszyny wirtualnej
 Name:          xen
 Version:       4.2.1
-Release:       1
+Release:       2
 License:       GPL v2, interface parts on BSD-like
 Group:         Applications/System
 Source0:       http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
@@ -91,6 +91,7 @@ Patch11:      %{name}-qemu.patch
 Patch12:       %{name}-scripts-locking.patch
 Patch13:       %{name}-close_lockfd_after_lock_attempt.patch
 Patch14:       %{name}-librt.patch
+Patch15:       %{name}-ulong.patch
 URL:           http://www.xen.org/products/xenhyp.html
 %{?with_opengl:BuildRequires:  OpenGL-devel}
 %{?with_sdl:BuildRequires:     SDL-devel >= 1.2.1}
@@ -378,6 +379,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