packages: xen/xen.spec - blktapctrl is started by xend, consider reworking ...

[baggins]

Author: baggins                      Date: Wed Feb 29 21:10:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- blktapctrl is started by xend, consider reworking xend
- verbose files to avoid packaging errors
- various bugfixes
- actually package ext4 support for stubdom grub

---- Files affected:
packages/xen:
   xen.spec (1.97 -> 1.98) 

---- Diffs:

================================================================
Index: packages/xen/xen.spec
diff -u packages/xen/xen.spec:1.97 packages/xen/xen.spec:1.98
--- packages/xen/xen.spec:1.97	Wed Feb 29 20:55:49 2012
+++ packages/xen/xen.spec	Wed Feb 29 22:10:03 2012
@@ -49,8 +49,17 @@
 Patch0:		%{name}-python_scripts.patch
 Patch1:		%{name}-symbols.patch
 Patch2:		%{name}-curses.patch
-Patch3:		%{name}-gcc.patch
-Patch4:		%{name}-xz.patch
+Patch3:		%{name}-xz.patch
+Patch4:		pygrubfix.patch
+Patch5:		pygrubfix2.patch
+Patch6:		qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
+Patch7:		xen-4.1-testing.23190.patch
+Patch8:		xend.catchbt.patch
+Patch9:		xend.empty.xml.patch
+Patch10:	xend-pci-loop.patch
+Patch11:	xen-dumpdir.patch
+# stubdom patch
+Patch100:	grub-ext4-support.patch
 URL:		http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
 BuildRequires:	SDL-devel
 BuildRequires:	acpica
@@ -194,14 +203,21 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%%patch3 -p1
+%patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %{__rm} -v tools/check/*.orig
 
 # stubdom sources
 ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
-ln -s %{PATCH23} stubdom/grub.patches/99grub-ext4-support.patch
+ln -s %{PATCH100} stubdom/grub.patches/99grub-ext4-support.patch
 ln -s %{SOURCE15} tools/firmware/etherboot/ipxe.tar.gz
 
 %build
@@ -230,8 +246,9 @@
 
 install %{SOURCE30} $RPM_BUILD_ROOT%{systemdunitdir}/proc-xen.mount
 install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-xenstored.mount
-install %{SOURCE32} $RPM_BUILD_ROOT%{systemdunitdir}/blktapctrl.service
-install %{SOURCE33} $RPM_BUILD_ROOT/etc/sysconfig/blktapctrl
+# started internally by xend
+#install %{SOURCE32} $RPM_BUILD_ROOT%{systemdunitdir}/blktapctrl.service
+#install %{SOURCE33} $RPM_BUILD_ROOT/etc/sysconfig/blktapctrl
 install %{SOURCE34} $RPM_BUILD_ROOT%{systemdunitdir}/xenconsoled.service
 install %{SOURCE35} $RPM_BUILD_ROOT/etc/sysconfig/xenconsoled
 install %{SOURCE36} $RPM_BUILD_ROOT%{systemdunitdir}/xenstored.service
@@ -310,14 +327,15 @@
 /boot/%{name}-syms-%{version}
 /boot/%{name}-%{version}.gz
 /boot/%{name}.gz
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xenconsoled
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xenstored
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xendomains
 %attr(754,root,root) /etc/rc.d/init.d/xen-watchdog
 %attr(754,root,root) /etc/rc.d/init.d/xenconsoled
 %attr(754,root,root) /etc/rc.d/init.d/xenstored
 %attr(754,root,root) /etc/rc.d/init.d/xendomains
 %{systemdunitdir}/proc-xen.mount
 %{systemdunitdir}/var-lib-xenstored.mount
-%{systemdunitdir}/blktapctrl.service
 %{systemdunitdir}/xen-watchdog.service
 %{systemdunitdir}/xenconsoled.service
 %{systemdunitdir}/xenstored.service
@@ -381,8 +399,10 @@
 
 %files xend
 %defattr(644,root,root,755)
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/xend
+#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blktapctrl
+#%{systemdunitdir}/blktapctrl.service
 %{systemdunitdir}/xend.service
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/xend
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xm*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xend*
 %attr(755,root,root) %{_sbindir}/xend
@@ -420,6 +440,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.98  2012/02/29 21:10:03  baggins
+- blktapctrl is started by xend, consider reworking xend
+- verbose files to avoid packaging errors
+- various bugfixes
+- actually package ext4 support for stubdom grub
+
 Revision 1.97  2012/02/29 19:55:49  baggins
 - fix condition in xenstored.init
 - properly install sysconfig files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xen/xen.spec?r1=1.97&r2=1.98&f=u