Fri Aug 29 11:12:18 UTC 2008

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31871

Modified Files:
	.cvsignore sources xen-3.0.2-config-allow-unix-server.patch 
	xen-3.0.2-config-disable-reloc.patch 
	xen-config-dom0-minmem.patch xen-dumpdir.patch 
	xen-initscript.patch xen-net-disable-bridge-by-default.patch 
	xen-net-disable-iptables-on-bridge.patch 
	xen-xenstore-cli.patch xen.spec 
Removed Files:
	xen-3.2.0-block-rw-range-check.patch xen-3.2.0-bzimage.patch 
	xen-3.2.0-qemu-evtchn-fd.patch xen-compile-fixes.patch 
	xen-hvm-kernel-boot-nonrelocatable.patch 
	xen-hvm-kernel-boot-relocatable.patch 
	xen-hvm-kernel-boot-xend.patch xen-ia64-hypercall-args.patch 
	xen-pvfb-validate-fb.patch xen-qemu-bootmenu.patch 
	xen-qemu-image-format.patch xen-qemu-logfile.patch 
	xen-timer-mode.patch 
Log Message:
Rebase to xen 3.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37

--- .cvsignore	18 Jan 2008 17:54:44 -0000	1.36
+++ .cvsignore	29 Aug 2008 11:11:46 -0000	1.37
@@ -1,3 +1,3 @@
 *.rpm
 .build*.log
-xen-3.2.0.tar.gz
+xen-3.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	18 Jan 2008 17:54:44 -0000	1.51
+++ sources	29 Aug 2008 11:11:46 -0000	1.52
@@ -1 +1 @@
-4aa57328d0802a063fa67dfc063da30e  xen-3.2.0.tar.gz
+331ca462286a6adc46e2b78696a25ada  xen-3.3.0.tar.gz

xen-3.0.2-config-allow-unix-server.patch:

Index: xen-3.0.2-config-allow-unix-server.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.0.2-config-allow-unix-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-3.0.2-config-allow-unix-server.patch	23 Jul 2008 14:34:05 -0000	1.2
+++ xen-3.0.2-config-allow-unix-server.patch	29 Aug 2008 11:11:46 -0000	1.3
@@ -1,8 +1,7 @@
-Index: xen-3.2.0/tools/examples/xend-config.sxp
-===================================================================
---- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
-+++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
-@@ -56,13 +56,13 @@
+diff -rup xen-3.3.0-orig/tools/examples/xend-config.sxp xen-3.3.0-new/tools/examples/xend-config.sxp
+--- xen-3.3.0-orig/tools/examples/xend-config.sxp	2008-08-29 11:36:41.000000000 +0100
++++ xen-3.3.0-new/tools/examples/xend-config.sxp	2008-08-29 11:40:02.000000000 +0100
+@@ -54,14 +54,14 @@
  
  
  #(xend-http-server no)
@@ -12,6 +11,7 @@
  #(xend-unix-xmlrpc-server yes)
  #(xend-relocation-server no)
  (xend-relocation-server yes)
+ #(xend-relocation-ssl-server no)
  
 -#(xend-unix-path /var/lib/xend/xend-socket)
 +(xend-unix-path /var/lib/xend/xend-socket)

xen-3.0.2-config-disable-reloc.patch:

Index: xen-3.0.2-config-disable-reloc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-3.0.2-config-disable-reloc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-3.0.2-config-disable-reloc.patch	23 Jul 2008 14:34:05 -0000	1.2
+++ xen-3.0.2-config-disable-reloc.patch	29 Aug 2008 11:11:46 -0000	1.3
@@ -1,15 +1,13 @@
-Index: xen-3.2.0/tools/examples/xend-config.sxp
-===================================================================
---- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
-+++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:29.000000000 +0100
-@@ -60,7 +60,9 @@
+diff -rup xen-3.3.0-orig/tools/examples/xend-config.sxp xen-3.3.0-new/tools/examples/xend-config.sxp
+--- xen-3.3.0-orig/tools/examples/xend-config.sxp	2008-08-29 11:41:15.000000000 +0100
++++ xen-3.3.0-new/tools/examples/xend-config.sxp	2008-08-29 11:42:19.000000000 +0100
+@@ -57,8 +57,7 @@
+ (xend-unix-server yes)
  #(xend-tcp-xmlrpc-server no)
  #(xend-unix-xmlrpc-server yes)
- #(xend-relocation-server no)
+-#(xend-relocation-server no)
 -(xend-relocation-server yes)
-+# The relocation server should be kept desactivated unless using a trusted
-+# network, the domain virtual memory will be exchanged in raw form without
-+# encryption of the communication. See also xend-relocation-hosts-allow option
++(xend-relocation-server no)
+ #(xend-relocation-ssl-server no)
  
  (xend-unix-path /var/lib/xend/xend-socket)
- 

xen-config-dom0-minmem.patch:

Index: xen-config-dom0-minmem.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-config-dom0-minmem.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-config-dom0-minmem.patch	23 Jul 2008 14:34:05 -0000	1.2
+++ xen-config-dom0-minmem.patch	29 Aug 2008 11:11:46 -0000	1.3
@@ -1,13 +1,13 @@
-Index: xen-3.2.0/tools/examples/xend-config.sxp
-===================================================================
---- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:26.000000000 +0100
-+++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-07-23 15:14:26.000000000 +0100
-@@ -181,7 +181,7 @@
- # Dom0 will balloon out when needed to free memory for domU.
- # dom0-min-mem is the lowest memory level (in MB) dom0 will get down to.
- # If dom0-min-mem=0, dom0 will never balloon out.
+diff -rup xen-3.3.0-orig/tools/examples/xend-config.sxp xen-3.3.0-new/tools/examples/xend-config.sxp
+--- xen-3.3.0-orig/tools/examples/xend-config.sxp	2008-08-29 11:32:57.000000000 +0100
++++ xen-3.3.0-new/tools/examples/xend-config.sxp	2008-08-29 11:36:00.000000000 +0100
+@@ -191,7 +191,7 @@
+ # dom0-min-mem is the lowest permissible memory level (in MB) for dom0.
+ # This is a minimum both for auto-ballooning (as enabled by
+ # enable-dom0-ballooning below) and for xm mem-set when applied to dom0.
 -(dom0-min-mem 196)
 +(dom0-min-mem 256)
  
- # In SMP system, dom0 will use dom0-cpus # of CPUS
- # If dom0-cpus = 0, dom0 will take all cpus available
+ # Whether to enable auto-ballooning of dom0 to allow domUs to be created.
+ # If enable-dom0-ballooning = no, dom0 will never balloon out.
+Only in xen-3.3.0-new/tools/examples: .#xend-config.sxp.rej

xen-dumpdir.patch:

Index: xen-dumpdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-dumpdir.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-dumpdir.patch	23 Jul 2008 14:34:05 -0000	1.3
+++ xen-dumpdir.patch	29 Aug 2008 11:11:46 -0000	1.4
@@ -1,7 +1,6 @@
-Index: xen-3.2.0/tools/debugger/gdb/README
-===================================================================
---- xen-3.2.0.orig/tools/debugger/gdb/README	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0.orig/tools/debugger/gdb/README	2008-01-16 18:34:59.000000000 +0000
+diff -rup xen-3.3.0-orig/tools/debugger/gdb/README xen-3.3.0-new/tools/debugger/gdb/README
+--- xen-3.3.0-orig/tools/debugger/gdb/README	2008-08-22 10:49:07.000000000 +0100
++++ xen-3.3.0-new/tools/debugger/gdb/README	2008-08-29 11:27:13.000000000 +0100
 @@ -33,6 +33,6 @@ To debug a crashed domU guest:
   1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before
      starting xend.
@@ -10,24 +9,22 @@
 +    '/var/lib/xen/dump/<domain-name>.<domain-id>.core'.
   3. Run 'gdbserver-xen 127.0.0.1:9999 --file <core-file>'.
   4. Connect to the server as for a running guest.
-Index: xen-3.2.0/tools/Makefile
-===================================================================
---- xen-3.2.0.orig/tools/Makefile	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0.orig/tools/Makefile	2008-01-16 18:34:59.000000000 +0000
-@@ -41,7 +41,7 @@ install: check
- 		$(MAKE) -C $$subdir $@; \
- 	done
- 	$(MAKE) ioemuinstall
+diff -rup xen-3.3.0-orig/tools/Makefile xen-3.3.0-new/tools/Makefile
+--- xen-3.3.0-orig/tools/Makefile	2008-08-22 10:49:07.000000000 +0100
++++ xen-3.3.0-new/tools/Makefile	2008-08-29 11:27:42.000000000 +0100
+@@ -49,7 +49,7 @@ all: subdirs-all
+ 
+ .PHONY: install
+ install: subdirs-install
 -	$(INSTALL_DIR) $(DESTDIR)/var/xen/dump
 +	$(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump
  	$(INSTALL_DIR) $(DESTDIR)/var/log/xen
  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xen
  
-Index: xen-3.2.0/tools/python/xen/xend/XendDomainInfo.py
-===================================================================
---- xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py	2008-07-23 15:14:26.000000000 +0100
-+++ xen-3.2.0.orig/tools/python/xen/xend/XendDomainInfo.py	2008-07-23 15:14:26.000000000 +0100
-@@ -1455,7 +1455,7 @@ class XendDomainInfo:
+diff -rup xen-3.3.0-orig/tools/python/xen/xend/XendDomainInfo.py xen-3.3.0-new/tools/python/xen/xend/XendDomainInfo.py
+--- xen-3.3.0-orig/tools/python/xen/xend/XendDomainInfo.py	2008-08-22 10:49:08.000000000 +0100
++++ xen-3.3.0-new/tools/python/xen/xend/XendDomainInfo.py	2008-08-29 11:27:14.000000000 +0100
+@@ -1843,7 +1843,7 @@ class XendDomainInfo:
          try:
              if not corefile:
                  this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
@@ -36,3 +33,4 @@
                                    self.info['name_label'], self.domid)
                  
              if os.path.isdir(corefile):
+Only in xen-3.3.0-new/tools/python/xen/xend: XendDomainInfo.py.orig

xen-initscript.patch:

Index: xen-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-initscript.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xen-initscript.patch	1 Feb 2008 23:30:45 -0000	1.10
+++ xen-initscript.patch	29 Aug 2008 11:11:47 -0000	1.11
@@ -445,7 +445,7 @@
  XENDOMAINS_INITD = init.d/xendomains
  XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
  
-@@ -67,6 +73,12 @@ install-initd:
+@@ -82,6 +88,12 @@ install-initd:
  	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
  	[ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig
  	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
@@ -458,10 +458,11 @@
  	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
  	$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
  
-diff -rupN xen-3.2.0.orig/tools/misc/xend xen-3.2.0.new/tools/misc/xend
---- xen-3.2.0.orig/tools/misc/xend	2008-02-01 17:13:01.000000000 -0500
-+++ xen-3.2.0.new/tools/misc/xend	2008-02-01 17:12:38.000000000 -0500
-@@ -8,142 +8,15 @@
+Only in xen-3.3.0.new/tools/examples: Makefile.orig
+diff -rup xen-3.3.0.orig/tools/misc/xend xen-3.3.0.new/tools/misc/xend
+--- xen-3.3.0.orig/tools/misc/xend	2008-08-22 10:49:08.000000000 +0100
++++ xen-3.3.0.new/tools/misc/xend	2008-08-29 11:10:46.000000000 +0100
+@@ -8,148 +8,16 @@
  """Xen management daemon.
     Provides console server and HTTP management api.
  
@@ -497,7 +498,7 @@
 -        print >>sys.stderr, result[1]
 -        sys.exit(1)
 -    sys.path.append(result[1])
--
+ 
  from xen.xend.server import SrvDaemon
  
 -class CheckError(ValueError):
@@ -534,6 +535,10 @@
 -        hline()
 -        raise CheckError("invalid user")
 -
+-def start_daemon(daemon, *args):
+-    if os.fork() == 0:
+-        os.execvp(daemon, (daemon,) + args)
+-
 -def start_xenstored():
 -    pidfname = "/var/run/xenstore.pid"
 -    try:
@@ -559,13 +564,15 @@
 -    s,o = commands.getstatusoutput(cmd)
 -
 -def start_consoled():
--    if os.fork() == 0:
--        os.execvp('xenconsoled', ['xenconsoled'])
+-    XENCONSOLED_TRACE = os.getenv("XENCONSOLED_TRACE")
+-    args = ""
+-    if XENCONSOLED_TRACE:
+-        args += "--log=" + XENCONSOLED_TRACE
+-    start_daemon("xenconsoled", args)
 -
 -def start_blktapctrl():
--    if os.fork() == 0:
--        os.execvp('blktapctrl', ['blktapctrl'])
--            
+-    start_daemon("blktapctrl", "")
+-
  def main():
 -    try:
 -        check_logging()
@@ -605,9 +612,9 @@
  
  if __name__ == '__main__':
      sys.exit(main())
-diff -rupN xen-3.2.0.orig/tools/python/xen/xend/osdep.py xen-3.2.0.new/tools/python/xen/xend/osdep.py
---- xen-3.2.0.orig/tools/python/xen/xend/osdep.py	2008-02-01 17:13:01.000000000 -0500
-+++ xen-3.2.0.new/tools/python/xen/xend/osdep.py	2008-02-01 17:12:38.000000000 -0500
+diff -rup xen-3.3.0.orig/tools/python/xen/xend/osdep.py xen-3.3.0.new/tools/python/xen/xend/osdep.py
+--- xen-3.3.0.orig/tools/python/xen/xend/osdep.py	2008-08-22 10:49:08.000000000 +0100
++++ xen-3.3.0.new/tools/python/xen/xend/osdep.py	2008-08-29 11:08:54.000000000 +0100
 @@ -26,7 +26,7 @@ _scripts_dir = {
  
  _xend_autorestart = {
@@ -617,9 +624,9 @@
      "SunOS": False,
  }
  
-diff -rupN xen-3.2.0.orig/tools/python/xen/xend/server/SrvDaemon.py xen-3.2.0.new/tools/python/xen/xend/server/SrvDaemon.py
---- xen-3.2.0.orig/tools/python/xen/xend/server/SrvDaemon.py	2008-02-01 17:13:01.000000000 -0500
-+++ xen-3.2.0.new/tools/python/xen/xend/server/SrvDaemon.py	2008-02-01 17:12:38.000000000 -0500
+diff -rup xen-3.3.0.orig/tools/python/xen/xend/server/SrvDaemon.py xen-3.3.0.new/tools/python/xen/xend/server/SrvDaemon.py
+--- xen-3.3.0.orig/tools/python/xen/xend/server/SrvDaemon.py	2008-08-22 10:49:08.000000000 +0100
++++ xen-3.3.0.new/tools/python/xen/xend/server/SrvDaemon.py	2008-08-29 11:08:54.000000000 +0100
 @@ -109,7 +109,14 @@ class Daemon:
          # Fork, this allows the group leader to exit,
          # which means the child can never again regain control of the

xen-net-disable-bridge-by-default.patch:

Index: xen-net-disable-bridge-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-disable-bridge-by-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-net-disable-bridge-by-default.patch	23 Jul 2008 14:34:05 -0000	1.2
+++ xen-net-disable-bridge-by-default.patch	29 Aug 2008 11:11:47 -0000	1.3
@@ -1,11 +1,7 @@
-Disable network-bridge script by default to avoid
-NetworkManager conflict
-
-Index: xen-3.2.0/tools/examples/xend-config.sxp
-===================================================================
---- xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0.orig/tools/examples/xend-config.sxp	2008-01-16 18:34:59.000000000 +0000
-@@ -138,7 +138,15 @@
+diff -rup xen-3.3.0-orig/tools/examples/xend-config.sxp xen-3.3.0-new/tools/examples/xend-config.sxp
+--- xen-3.3.0-orig/tools/examples/xend-config.sxp	2008-08-22 10:49:07.000000000 +0100
++++ xen-3.3.0-new/tools/examples/xend-config.sxp	2008-08-29 11:28:39.000000000 +0100
+@@ -149,7 +149,15 @@
  # two fake interfaces per guest domain.  To do things like this, write
  # yourself a wrapper script, and call network-bridge from it, as appropriate.
  #
@@ -22,7 +18,7 @@
  
  # The script used to control virtual interfaces.  This can be overridden on a
  # per-vif basis when creating a domain or a configuring a new vif.  The
-@@ -158,12 +166,14 @@
+@@ -169,12 +177,14 @@
  
  ## Use the following if network traffic is routed, as an alternative to the
  # settings for bridged networking given above.

xen-net-disable-iptables-on-bridge.patch:

Index: xen-net-disable-iptables-on-bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-net-disable-iptables-on-bridge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-net-disable-iptables-on-bridge.patch	23 Jul 2008 14:34:05 -0000	1.2
+++ xen-net-disable-iptables-on-bridge.patch	29 Aug 2008 11:11:47 -0000	1.3
@@ -1,11 +1,19 @@
-We don't want the system's iptables filter/FORWARD
-rules to apply to traffic on our bridge.
-
-Index: xen-3.2.0/tools/examples/xen-network-common.sh
-===================================================================
---- xen-3.2.0.orig/tools/examples/xen-network-common.sh	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0.orig/tools/examples/xen-network-common.sh	2008-01-16 18:34:59.000000000 +0000
-@@ -109,6 +109,13 @@ create_bridge () {
+diff -rup xen-3.3.0-orig/tools/examples/vif-bridge xen-3.3.0-new/tools/examples/vif-bridge
+--- xen-3.3.0-orig/tools/examples/vif-bridge	2008-08-22 10:49:07.000000000 +0100
++++ xen-3.3.0-new/tools/examples/vif-bridge	2008-08-29 11:29:38.000000000 +0100
+@@ -91,8 +91,6 @@ case "$command" in
+         ;;
+ esac
+ 
+-handle_iptable
+-
+ log debug "Successful vif-bridge $command for $vif, bridge $bridge."
+ if [ "$command" == "online" ]
+ then
+diff -rup xen-3.3.0-orig/tools/examples/xen-network-common.sh xen-3.3.0-new/tools/examples/xen-network-common.sh
+--- xen-3.3.0-orig/tools/examples/xen-network-common.sh	2008-08-22 10:49:07.000000000 +0100
++++ xen-3.3.0-new/tools/examples/xen-network-common.sh	2008-08-29 11:29:38.000000000 +0100
+@@ -99,6 +99,13 @@ create_bridge () {
  	brctl addbr ${bridge}
  	brctl stp ${bridge} off
  	brctl setfd ${bridge} 0
@@ -19,16 +27,3 @@
      fi
  }
  
-Index: xen-3.2.0/tools/examples/vif-bridge
-===================================================================
---- xen-3.2.0.orig/tools/examples/vif-bridge	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0.orig/tools/examples/vif-bridge	2008-01-16 18:34:59.000000000 +0000
-@@ -91,8 +91,6 @@ case "$command" in
-         ;;
- esac
- 
--handle_iptable
--
- log debug "Successful vif-bridge $command for $vif, bridge $bridge."
- if [ "$command" == "online" ]
- then

xen-xenstore-cli.patch:

Index: xen-xenstore-cli.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-xenstore-cli.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-xenstore-cli.patch	23 Jul 2008 14:34:05 -0000	1.3
+++ xen-xenstore-cli.patch	29 Aug 2008 11:11:47 -0000	1.4
@@ -13,18 +13,4 @@
  
    again:
      if (transaction) {
-Index: xen-3.2.0/tools/xenstore/xsls.c
-===================================================================
---- xen-3.2.0.orig/tools/xenstore/xsls.c	2008-01-16 18:34:59.000000000 +0000
-+++ xen-3.2.0.orig/tools/xenstore/xsls.c	2008-01-16 18:34:59.000000000 +0000
-@@ -163,7 +163,9 @@ int main(int argc, char *argv[])
- 
-     xsh = socket ? xs_daemon_open() : xs_domain_open();
-     if (xsh == NULL)
--        err(1, socket ? "xs_daemon_open" : "xs_domain_open");
-+       xsh = socket ? xs_domain_open() : xs_daemon_open();
-+    if (xsh == NULL)
-+       err(1, "xs_*_open");
- 
-     print_dir(xsh, (argc - optind) == 1 ? argv[optind] : "/", 0, show_perm);
  


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- xen.spec	23 Jul 2008 14:34:05 -0000	1.221
+++ xen.spec	29 Aug 2008 11:11:47 -0000	1.222
@@ -1,11 +1,11 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # Always set these 3 tags
-%define base_version 3.2.0
-%define base_release 17
+%define base_version 3.3.0
+%define base_release 1
 
 # Hypervisor ABI
-%define hv_abi  3.2
+%define hv_abi  3.3
 # Whether to build -hypervisor pacakges
 %define hv_build 1
 
@@ -60,26 +60,11 @@
 Source1: %{name}.modules
 Source2: %{name}.logrotate
 Patch1: xen-initscript.patch
-Patch3: xen-compile-fixes.patch
-Patch5: xen-hvm-kernel-boot-xend.patch
-Patch6: xen-hvm-kernel-boot-relocatable.patch
-Patch7: xen-hvm-kernel-boot-nonrelocatable.patch
 Patch8: xen-xenstore-cli.patch
-Patch9: xen-timer-mode.patch
 
 Patch13: xen-dumpdir.patch
 Patch14: xen-net-disable-bridge-by-default.patch
 Patch15: xen-net-disable-iptables-on-bridge.patch
-Patch16: xen-3.2.0-block-rw-range-check.patch
-Patch17: xen-3.2.0-qemu-evtchn-fd.patch
-Patch18: xen-qemu-logfile.patch
-Patch19: xen-ia64-hypercall-args.patch
-
-Patch36: xen-qemu-bootmenu.patch
-Patch37: xen-pvfb-validate-fb.patch
-Patch38: xen-qemu-image-format.patch
-
-Patch40: xen-3.2.0-bzimage.patch
 
 # Patches to modify the default config of xend
 Patch100: xen-config-dom0-minmem.patch
@@ -135,6 +120,7 @@
 Summary: Core Xen runtime environment
 Group: Development/Libraries
 Requires: xen-libs = %{version}-%{release}
+Requires: /usr/bin/qemu-img
 # Ensure we at least have a suitable kernel installed, though we can't
 # force user to actually boot it.
 Requires: xen-hypervisor-abi = %{hv_abi}
@@ -166,27 +152,11 @@
 %prep
 %setup -q -n %{directory_tag}
 %patch1 -p1
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-
-%patch36 -p1
-
-%patch37 -p1
-%patch38 -p1
-
-%patch40 -p1
 
 # config patches
 %patch100 -p1
@@ -273,6 +243,25 @@
 # avoid conflicting with qemu (#199759)
 rm -f %{buildroot}/%{_mandir}/man*/qemu*
 
+# Don't duplicate binary already provided in QEMU
+rm -f %{buildroot}/%{_bindir}/qemu-img-xen
+ln -s qemu-img %{buildroot}/%{_bindir}/qemu-img-xen
+
+# Blow away clashing files
+rm -f %{buildroot}/%{_datadir}/xen/man/man1/qemu.1*
+rm -f %{buildroot}/%{_datadir}/xen/man/man1/qemu-img.1*
+
+# blow away unused files
+for i in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \
+         pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
+         vgabios.bin vgabios-cirrus.bin video.x
+do
+  rm -f %{buildroot}/%{_datadir}/xen/qemu/$i
+done
+
+# blow away README's not intended for end users
+rm -f %{buildroot}/%{_sysconfdir}/xen/README*
+
 #find_lang xen-xm
 
 %post
@@ -426,6 +415,8 @@
 %dir %attr(0700,root,root) %{_localstatedir}/run/xend/boot
 
 # All xenstore CLI tools
+%{_bindir}/qemu-img-xen
+%{_bindir}/xenstore
 %{_bindir}/xenstore-*
 %{_bindir}/pygrub
 %{_bindir}/xentrace*
@@ -440,6 +431,7 @@
 %{_sbindir}/img2qcow
 # Misc stuff
 %{_bindir}/xen-detect
+%{_sbindir}/fs-backend
 %{_sbindir}/xen-bugtool
 %{_sbindir}/xenconsoled
 %{_sbindir}/xenmon.py*
@@ -469,6 +461,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Aug 29 2008 Daniel P. Berrange <berrange at redhat.com> - 3.3.0-1.fc10
+- Update to xen 3.3.0 release
+
 * Wed Jul 23 2008 Mark McLoughlin <markmc at redhat.com> - 3.2.0-17.fc10
 - Enable xen-hypervisor build
 - Backport support for booting DomU from bzImage


--- xen-3.2.0-block-rw-range-check.patch DELETED ---


--- xen-3.2.0-bzimage.patch DELETED ---


--- xen-3.2.0-qemu-evtchn-fd.patch DELETED ---


--- xen-compile-fixes.patch DELETED ---


--- xen-hvm-kernel-boot-nonrelocatable.patch DELETED ---


--- xen-hvm-kernel-boot-relocatable.patch DELETED ---


--- xen-hvm-kernel-boot-xend.patch DELETED ---


--- xen-ia64-hypercall-args.patch DELETED ---


--- xen-pvfb-validate-fb.patch DELETED ---


--- xen-qemu-bootmenu.patch DELETED ---


--- xen-qemu-image-format.patch DELETED ---


--- xen-qemu-logfile.patch DELETED ---


--- xen-timer-mode.patch DELETED ---


