diff --git a/.cvsignore b/.cvsignore index 60343d9..25fbb3f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xen-unstable-10712.tar.bz2 +xen-unstable-11251.tar.bz2 diff --git a/sources b/sources index ce07a8b..d9401fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cd2e914ab01ddcbeac89c53fcec09e3 xen-unstable-10712.tar.bz2 +0f64d31cf34cf3c92508569cb89c1ee6 xen-unstable-11251.tar.bz2 diff --git a/xen-compile-fixes.patch b/xen-compile-fixes.patch index 3eaea66..df9437c 100644 --- a/xen-compile-fixes.patch +++ b/xen-compile-fixes.patch @@ -1,39 +1,36 @@ ---- xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c.~1~ 2006-07-13 15:39:15.000000000 +0100 -+++ xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c 2006-07-13 19:04:59.000000000 +0100 -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #include +--- xen-unstable-11234/tools/ioemu/usb-linux.c.compile 2006-08-23 16:20:15.000000000 -0400 ++++ xen-unstable-11234/tools/ioemu/usb-linux.c 2006-08-23 16:21:25.000000000 -0400 +@@ -26,7 +26,6 @@ + #if defined(__linux__) #include - #include ---- xen-unstable-10712/tools/blktap/drivers/block-vmdk.c.return 2006-07-21 13:45:14.000000000 -0400 -+++ xen-unstable-10712/tools/blktap/drivers/block-vmdk.c 2006-07-21 13:45:34.000000000 -0400 -@@ -226,6 +226,7 @@ - int min_index, i, j; - uint32_t min_count, *l2_table, tmp; - uint64_t cluster_offset; -+ int dummy; - - l1_index = (offset >> 9) / prv->l1_entry_sectors; - if (l1_index >= prv->l1_size) -@@ -268,7 +269,7 @@ - if (!allocate) - return 0; - cluster_offset = lseek(prv->fd, 0, SEEK_END); -- ftruncate(prv->fd, cluster_offset + -+ dummy = ftruncate(prv->fd, cluster_offset + - (prv->cluster_sectors << 9)); - cluster_offset >>= 9; - /* update L2 table */ ---- xen-unstable-10712/tools/blktap/drivers/Makefile.error 2006-07-21 13:47:55.000000000 -0400 -+++ xen-unstable-10712/tools/blktap/drivers/Makefile 2006-07-21 13:47:58.000000000 -0400 -@@ -13,7 +13,6 @@ - CFLAGS += -fPIC - CFLAGS += -Wall + #include +-#include + #include + #include + +--- xen-unstable-11234/tools/blktap/drivers/Makefile.compile 2006-08-23 06:27:06.000000000 -0400 ++++ xen-unstable-11234/tools/blktap/drivers/Makefile 2006-08-23 16:16:28.000000000 -0400 +@@ -10,12 +10,6 @@ + INSTALL_DIR = /usr/sbin + LIBAIO_DIR = ../../libaio/src + +-CFLAGS += -fPIC +-CFLAGS += -Wall -CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -g3 - CFLAGS += -fno-strict-aliasing +-CFLAGS += -Wno-unused +-CFLAGS += -g3 +-CFLAGS += -fno-strict-aliasing CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR) + CFLAGS += $(INCLUDES) -I. -I../../xenstore + CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +--- xen-unstable-11234/Config.mk.compile 2006-08-23 06:27:06.000000000 -0400 ++++ xen-unstable-11234/Config.mk 2006-08-23 16:16:28.000000000 -0400 +@@ -10,7 +10,7 @@ + + # Tools to run on system hosting the build + HOSTCC = gcc +-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer ++HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer + + AS = $(CROSS_COMPILE)as + LD = $(CROSS_COMPILE)ld diff --git a/xen.spec b/xen.spec index 353bf4c..c1cbe04 100644 --- a/xen.spec +++ b/xen.spec @@ -1,37 +1,26 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define changeset 11251 + Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.2 -Release: 25 +Release: 26 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html -Source0: xen-unstable-10712.tar.bz2 -Source3: xen-udev.rules +Source0: xen-unstable-%{changeset}.tar.bz2 Patch1: xen-initscript.patch -Patch2: xen-change-default-nic.patch Patch3: xen-compile-fixes.patch Patch6: xen-network-iptables-bridge.patch Patch8: xen-vmxballoon-hack.patch -Patch11: xen-3.0.1-cloexec.patch -Patch12: xen-3.0.1-tempdir.patch Patch13: xen-noblktap.patch -Patch14: xen-hvm-osync.patch # Patches to modify the default config of xend Patch100: xen-config-dom0-minmem.patch Patch102: xen-3.0.2-config-allow-unix-server.patch Patch103: xen-3.0.2-config-disable-reloc.patch -# upstream already -Patch200: xen-libxenstore-exec.patch -Patch201: xen-libblktap-symlinks.patch -Patch202: xen-xenstore-version.patch -Patch203: xen-hvm-nettap.patch -Patch204: xen-rtl8139-fix.patch -Patch205: xen-ia64-rollup.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel BuildRequires: libX11-devel python-devel ghostscript tetex-latex @@ -86,30 +75,18 @@ This package contains what's needed to develop applications to manage Xen virtual machines. %prep -%setup -q -n xen-unstable-10712 +%setup -q -n xen-unstable-%{changeset} %patch1 -p1 -b .init -#patch2 -p1 -b .nic %patch3 -p1 -b .compile %patch6 -p1 -%patch8 -p1 -#patch11 -p1 -b .cloexec -%patch12 -p1 -b .tempdir +#patch8 -p1 # FIXME: need to pull this one back %patch13 -p1 -b .blktap -%patch14 -p1 -b .osync # config patches %patch100 -p1 %patch102 -p1 %patch103 -p1 -# upstream'd patches -%patch200 -p1 -%patch201 -p1 -%patch202 -p1 -%patch203 -p1 -%patch204 -p1 -%patch205 -p1 - %build CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs @@ -146,7 +123,6 @@ mkdir -p %{buildroot}/etc/rc.d mv -f %{buildroot}/etc/init.d %{buildroot}/etc/rc.d/ mv -f %{buildroot}/etc/udev/xen-backend.rules %{buildroot}/etc/udev/rules.d/ -install -m 0644 %{SOURCE3} %{buildroot}/etc/udev/rules.d/60-xen.rules # silly doc dir fun rm -fr %{buildroot}/%{_datadir}/doc/xen/ @@ -222,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.a %changelog +* Mon Aug 28 2006 Jeremy Katz - 3.0.2-26 +- update to xen-unstable cs 11251 +- clean up patches some + * Tue Aug 22 2006 Jeremy Katz - 3.0.2-25 - make initscript not spew on non-xen kernels (#202945)