rpms/xen/devel xen-dumpdir.patch,NONE,1.1 xen.spec,1.162,1.163

[fedora-cvs-commits at redhat.com]

Author: berrange

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29823

Modified Files:
	xen.spec 
Added Files:
	xen-dumpdir.patch 
Log Message:
Fix development headers. Move coredumps to /var/lib/xen/dump. Protect log files mode 0700

xen-dumpdir.patch:
 Makefile                          |    2 +-
 debugger/gdb/README               |    2 +-
 python/xen/xend/XendDomainInfo.py |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xen-dumpdir.patch ---
diff -ru xen-3.0.4_1-src/tools/debugger/gdb/README xen-3.0.4_1-src-new/tools/debugger/gdb/README
--- xen-3.0.4_1-src/tools/debugger/gdb/README	2007-01-08 10:00:47.000000000 -0500
+++ xen-3.0.4_1-src-new/tools/debugger/gdb/README	2007-01-22 11:28:33.000000000 -0500
@@ -33,6 +33,6 @@
  1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before
     starting xend.
  2. When the domain crashes, a core file is written to
-    '/var/xen/dump/<domain-name>.<domain-id>.core'.
+    '/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.
diff -ru xen-3.0.4_1-src/tools/Makefile xen-3.0.4_1-src-new/tools/Makefile
--- xen-3.0.4_1-src/tools/Makefile	2007-01-08 10:00:46.000000000 -0500
+++ xen-3.0.4_1-src-new/tools/Makefile	2007-01-22 11:28:13.000000000 -0500
@@ -41,7 +41,7 @@
 		$(MAKE) -C $$subdir $@; \
 	done
 	$(MAKE) ioemuinstall
-	$(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump
+	$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen/dump
 	$(INSTALL_DIR) -p $(DESTDIR)/var/log/xen
 
 .PHONY: clean
diff -ru xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py xen-3.0.4_1-src-new/tools/python/xen/xend/XendDomainInfo.py
--- xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py	2007-01-08 10:00:50.000000000 -0500
+++ xen-3.0.4_1-src-new/tools/python/xen/xend/XendDomainInfo.py	2007-01-22 11:29:03.000000000 -0500
@@ -1151,7 +1151,7 @@
         try:
             if not corefile:
                 this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
-                corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time,
+                corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time,
                                   self.info['name_label'], self.domid)
                 
             if os.path.isdir(corefile):


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- xen.spec	18 Jan 2007 18:19:04 -0000	1.162
+++ xen.spec	22 Jan 2007 16:43:12 -0000	1.163
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.4
-Release: 1%{dist}
+Release: 2%{dist}
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -12,6 +12,7 @@
 Patch1: xen-initscript.patch
 Patch3: xen-compile-fixes.patch
 Patch6: xen-network-iptables-bridge.patch
+Patch13: xen-dumpdir.patch
 Patch20: xen-blktap-no-aio-epoll.patch
 Patch21: xen-blktap-error-returns.patch
 
@@ -84,6 +85,7 @@
 %patch1 -p1 -b .init
 %patch3 -p1 -b .compile
 %patch6 -p1
+%patch13 -p1
 
 # blktap patches
 %patch20 -p1
@@ -133,8 +135,10 @@
 
 # install all of the public headers
 mkdir -p %{buildroot}%{_includedir}/xen/io %{buildroot}%{_includedir}/xen/hvm
+mkdir -p %{buildroot}%{_includedir}/xen/arch-x86
 install -m 644 xen/include/public/io/*.h %{buildroot}%{_includedir}/xen/io
 install -m 644 xen/include/public/hvm/*.h %{buildroot}%{_includedir}/xen/hvm
+install -m 644 xen/include/public/arch-x86/*.h %{buildroot}%{_includedir}/xen/arch-x86
 install -m 644 xen/include/public/*.h %{buildroot}%{_includedir}/xen/
 install -m 644 xen/include/public/COPYING %{buildroot}%{_includedir}/xen/
 
@@ -148,7 +152,8 @@
 rm -fr %{buildroot}/%{_datadir}/doc/xen/
 
 # create dirs in /var/run so that selinux contexts are right (#195952)
-mkdir -p %{buildroot}/var/run/xend %{buildroot}/var/xen/dump %{buildroot}/var/log/xen
+mkdir -p %{buildroot}/var/run/xend %{buildroot}/var/log/xen
+mkdir -p %{buildroot}/var/lib/xen/images
 
 # avoid conflicting with qemu (#199759)
 rm -f %{buildroot}/%{_mandir}/man*/qemu*
@@ -195,9 +200,7 @@
 %dir %{_localstatedir}/lib/xenstored
 %dir %{_localstatedir}/run/xenstored
 %dir %{_localstatedir}/run/xend
-%dir %{_localstatedir}/xen
-%dir %{_localstatedir}/xen/dump
-%dir /var/log/xen
+%dir %attr(0700,root,root) /var/log/xen
 
 %files libs
 %defattr(-,root,root)
@@ -213,6 +216,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Jan 22 2007 Daniel P. Berrange <berrange at redhat.com> - 3.0.4-2
+- Ensure the arch-x86 header files are included in xen-devel package
+- Bring back patch to move /var/xen/dump to /var/lib/xen/dump
+- Make /var/log/xen mode 0700
+
 * Thu Jan 11 2007 Daniel P. Berrange <berrange at redhat.com> - 3.0.4-1
 - Upgrade to official xen-3.0.4_1 release tarball