rpms/xen/devel xen-disable-latex-docs.patch, NONE, 1.1 xen-timer-mode.patch, NONE, 1.1 xen.spec, 1.207, 1.208

Sun Feb 3 18:20:36 UTC 2008

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14191

Modified Files:
	xen.spec 
Added Files:
	xen-disable-latex-docs.patch xen-timer-mode.patch 
Log Message:
Fix creation of HVM guests wrt to timer mode bug. Temporarily disable latex due to bz 431327

xen-disable-latex-docs.patch:

--- NEW FILE xen-disable-latex-docs.patch ---
diff -rup xen-3.2.0.orig/docs/Makefile xen-3.2.0.new/docs/Makefile
--- xen-3.2.0.orig/docs/Makefile	2008-01-16 13:34:59.000000000 -0500
+++ xen-3.2.0.new/docs/Makefile	2008-02-03 13:12:19.000000000 -0500
@@ -21,11 +21,7 @@ GFX = $(patsubst %.fig, %.eps, $(wildcar
 all: build
 
 .PHONY: build
-build: ps pdf html man-pages
-	@if which $(DOT) 1>/dev/null 2>/dev/null ; then              \
-	$(MAKE) -C xen-api build ; else                              \
-        echo "Graphviz (dot) not installed; skipping xen-api." ; fi
-	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
+build: man-pages
 
 .PHONY: dev-docs
 dev-docs: python-dev-docs
@@ -80,17 +76,9 @@ distclean: clean
 
 .PHONY: install
 install: all
-	rm -rf $(DESTDIR)$(pkgdocdir)
-	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
-
-	$(MAKE) -C xen-api install
-
-	cp -dR ps $(DESTDIR)$(pkgdocdir)
-	cp -dR pdf $(DESTDIR)$(pkgdocdir)
 	$(INSTALL_DIR) $(DESTDIR)$(mandir)
 	cp -dR man1 $(DESTDIR)$(mandir)
 	cp -dR man5 $(DESTDIR)$(mandir)
-	[ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
 
 pdf/%.pdf: ps/%.ps
 	$(INSTALL_DIR) $(@D)

xen-timer-mode.patch:

--- NEW FILE xen-timer-mode.patch ---
changeset:   16764:3f26758bcc02
user:        Keir Fraser <keir.fraser at citrix.com>
date:        Fri Jan 18 22:27:51 2008 +0000
files:       tools/python/xen/xend/XendDomainInfo.py
description:
xend: Handle unspecified timer_mode domain platform parameter.
Signed-off-by: Keir Fraser <keir.fraser at citrix.com>


diff -r 1e6455d608bd -r 3f26758bcc02 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py	Fri Jan 18 16:20:47 2008 +0000
+++ b/tools/python/xen/xend/XendDomainInfo.py	Fri Jan 18 22:27:51 2008 +0000
@@ -1650,9 +1650,10 @@ class XendDomainInfo:
         self._recreateDom()
 
         # Set timer configration of domain
-        if hvm:
+        timer_mode = self.info["platform"].get("timer_mode")
+        if hvm and timer_mode is not None:
             xc.hvm_set_param(self.domid, HVM_PARAM_TIMER_MODE,
-                long(self.info["platform"].get("timer_mode")))
+                             long(timer_mode))
 
         # Set maximum number of vcpus in domain
         xc.domain_max_vcpus(self.domid, int(self.info['VCPUs_max']))



Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- xen.spec	2 Feb 2008 22:38:15 -0000	1.207
+++ xen.spec	3 Feb 2008 18:19:57 -0000	1.208
@@ -2,7 +2,7 @@
 
 # Always set these 3 tags
 %define base_version 3.2.0
-%define base_release 4
+%define base_release 5
 
 # Hypervisor ABI
 %define hv_abi  3.2
@@ -66,6 +66,9 @@
 Patch6: xen-hvm-kernel-boot-relocatable.patch
 Patch7: xen-hvm-kernel-boot-nonrelocatable.patch
 Patch8: xen-xenstore-cli.patch
+Patch9: xen-timer-mode.patch
+# Temporary hack see rhbz #431327
+Patch10: xen-disable-latex-docs.patch
 Patch13: xen-dumpdir.patch
 
 Patch36: xen-qemu-bootmenu.patch
@@ -160,6 +163,8 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 %patch13 -p1
 
 %patch36 -p1
@@ -291,7 +296,7 @@
 %files
 %defattr(-,root,root)
 %doc COPYING README
-%doc docs/pdf/
+#doc docs/pdf/
 %doc docs/misc/
 %{_sbindir}/xend
 %{_sbindir}/xm
@@ -443,6 +448,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Sun Feb  3 2008 Daniel P. Berrange <berrange at redhat.com> - 3.2.0-5.fc9
+- Fix timer mode parameter handling for HVM
+- Temporarily disable all Latex docs due to texlive problems (rhbz #431327)
+
 * Fri Feb  1 2008 Daniel P. Berrange <berrange at redhat.com> - 3.2.0-4.fc9
 - Add a xen-runtime subpackage to allow use of Xen without XenD
 - Split init script out to one script per daemon


