xen-tools: Updated (3.4.0 -> 4.0.1)

base/xen-tools/compile-fix.patch

@@ -0,0 +1,52 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../xen-tools/compile-fix.patch
+# Copyright (C) 2010 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -Nur xen-4.0.1-orig/tools/ioemu-qemu-xen/configure xen-4.0.1/tools/ioemu-qemu-xen/configure
+--- xen-4.0.1-orig/tools/ioemu-qemu-xen/configure	2010-09-23 17:45:26.648000253 +0200
++++ xen-4.0.1/tools/ioemu-qemu-xen/configure	2010-09-23 17:46:35.044000252 +0200
+@@ -1436,7 +1436,7 @@
+   if test "$target_softmmu" = "no" -o "$static" = "yes"; then
+     echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
+   elif test "$sdl_x11" = "yes" ; then
+-    echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_mak
++    echo "SDL_LIBS=`$sdl_config --libs` `pkg-config --cflags x11 --libs`" >> $config_mak
+   else
+     echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
+   fi
+diff -Nur xen-4.0.1-orig/tools/libxc/Makefile xen-4.0.1/tools/libxc/Makefile
+--- xen-4.0.1-orig/tools/libxc/Makefile	2010-09-23 17:45:26.892000253 +0200
++++ xen-4.0.1/tools/libxc/Makefile	2010-09-23 17:47:17.984000252 +0200
+@@ -174,7 +174,7 @@
+ 
+ libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
+ libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lbz2 -lxenctrl $(PTHREAD_LIBS)
+ 
+ -include $(DEPS)
+ 
+diff -Nur xen-4.0.1-orig/tools/xcutils/Makefile xen-4.0.1/tools/xcutils/Makefile
+--- xen-4.0.1-orig/tools/xcutils/Makefile	2010-09-23 17:45:26.932000253 +0200
++++ xen-4.0.1/tools/xcutils/Makefile	2010-09-23 17:47:49.136000252 +0200
+@@ -16,7 +16,7 @@
+ 
+ PROGRAMS = xc_restore xc_save readnotes lsevtchn
+ 
+-LDLIBS   = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
++LDLIBS   = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore) -lbz2
+ 
+ .PHONY: all
+ all: build

base/xen-tools/compile.patch

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../xen-tools/compile.patch
-# Copyright (C) 2009 The OpenSDE Project
+# Copyright (C) 2009 - 2010 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -15,8 +15,9 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- tools/xenstat/xentop/Makefile.orig	2009-08-02 18:15:18.000000000 +0300
-+++ tools/xenstat/xentop/Makefile	2009-08-02 18:17:00.000000000 +0300
+diff -Nur xen-3.4.2-orig/tools/xenstat/xentop/Makefile xen-3.4.2/tools/xenstat/xentop/Makefile
+--- xen-3.4.2-orig/tools/xenstat/xentop/Makefile	2010-01-14 13:16:35.000000000 +0000
++++ xen-3.4.2/tools/xenstat/xentop/Makefile	2010-01-15 18:06:31.000000000 +0000
 @@ -19,8 +19,8 @@
  else
  
@@ -28,3 +29,4 @@
  CFLAGS += -DHOST_$(XEN_OS)
  
  .PHONY: all
+

base/xen-tools/xen-tools.conf

@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../xen-tools/xen-tools.conf
+# Copyright (C) 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -12,7 +13,4 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-var_append GCC_WRAPPER_REMOVE " " "-Werror"
-
-srcdir=xen-*/tools
-
+custmain="make xen tools; make install-xen install-tools"

base/xen-tools/xen-tools.desc

@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../xen-tools/xen-tools.desc
-[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -33,7 +33,7 @@
 
 [L] GPL
 [S] Stable
-[V] 3.4.0
+[V] 4.0.1
 [P] X -----5---9 179.300
 
-[D] 1430562257 xen-3.4.0-xen.tar.gz http://bits.xensource.com/oss-xen/release/3.4.0/
+[D] 545092060 xen-4.0.1.tar.gz http://bits.xensource.com/oss-xen/release/4.0.1/