rpms/xen/F-11 dom0-kernel.repo, NONE, 1.1 init.blktapctrl, NONE, 1.1 init.xenconsoled, NONE, 1.1 init.xend, NONE, 1.1 init.xenstored, NONE, 1.1 sysconfig.blktapctrl, NONE, 1.1 sysconfig.xenconsoled, NONE, 1.1 sysconfig.xenstored, NONE, 1.1 xen-configure-xend.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 sources, 1.54, 1.55 xen-dumpdir.patch, 1.4, 1.5 xen-initscript.patch, 1.11, 1.12 xen-net-disable-iptables-on-bridge.patch, 1.3, 1.4 xen.spec, 1.236, 1.237 xen-3.0.2-config-allow-unix-server.patch, 1.3, NONE xen-3.0.2-config-disable-reloc.patch, 1.3, NONE xen-backport-hg18782.patch, 1.1, NONE xen-backport-hg19075.patch, 1.1, NONE xen-backport-hg19108.patch, 1.1, NONE xen-backport-hg19109.patch, 1.1, NONE xen-backport-hg19110.patch, 1.1, NONE xen-config-dom0-minmem.patch, 1.3, NONE xen-gcc44-buildfix.patch, 1.1, NONE xen-initscript-pvops.patch, 1.1, NONE xen-net-disable-bridge-by-default.patch, 1.3, NONE
Gerd Hoffmann
kraxel at fedoraproject.org
Wed May 27 20:06:28 UTC 2009
- Previous message (by thread): rpms/pdfchain/devel import.log, NONE, 1.1 pdfchain-desktop.patch, NONE, 1.1 pdfchain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/pdfchain/F-10 pdfchain-desktop.patch, NONE, 1.1 pdfchain.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kraxel
Update of /cvs/pkgs/rpms/xen/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16320
Modified Files:
.cvsignore sources xen-dumpdir.patch xen-initscript.patch
xen-net-disable-iptables-on-bridge.patch xen.spec
Added Files:
dom0-kernel.repo init.blktapctrl init.xenconsoled init.xend
init.xenstored sysconfig.blktapctrl sysconfig.xenconsoled
sysconfig.xenstored xen-configure-xend.patch
Removed Files:
xen-3.0.2-config-allow-unix-server.patch
xen-3.0.2-config-disable-reloc.patch
xen-backport-hg18782.patch xen-backport-hg19075.patch
xen-backport-hg19108.patch xen-backport-hg19109.patch
xen-backport-hg19110.patch xen-config-dom0-minmem.patch
xen-gcc44-buildfix.patch xen-initscript-pvops.patch
xen-net-disable-bridge-by-default.patch
Log Message:
update to 3.4.0
--- NEW FILE dom0-kernel.repo ---
[dom0-kernel]
name=Experimental pv_ops/dom0 kernels for Fedora - $basearch
baseurl=http://myoung.fedorapeople.org/dom0/$basearch/
enabled=0
gpgcheck=0
[dom0-kernel-source]
name=Experimental pv_ops/dom0 kernels for Fedora - Source
baseurl=http://myoung.fedorapeople.org/dom0/src/
enabled=0
gpgcheck=0
--- NEW FILE init.blktapctrl ---
#!/bin/bash
#
# blktapctrl Script to start the Xen blktapctrl daemon
#
# Author: Daniel Berrange <berrange at redhat.com>
#
# chkconfig: 2345 97 01
# description: Starts and stops the Xen blktapctrl daemon.
### BEGIN INIT INFO
# Provides: blktapctrl
# Required-Start: $syslog $remote_fs
# Should-Start:
# Required-Stop: $syslog $remote_fs
# Should-Stop:
# Default-Start: 3 4 5
# Default-Stop: 0 1 2 6
# Default-Enabled: yes
# Short-Description: Start/stop blktapctrl
# Description: Starts and stops the Xen blktapctrl daemon
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
if [ ! -d /proc/xen ]; then
exit 0
fi
if ! grep -q "control_d" /proc/xen/capabilities ; then
exit 0
fi
# Default config params
BLKTAPCTRL_ARGS=
# User customized params
test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl
start() {
echo -n $"Starting xen blktapctrl daemon: "
/usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl
}
stop() {
echo -n $"Stoping xen blktapctrl daemon: "
# blktapctrl is not restartable. So we refuse to stop it
# unless the machine is being shutdown or rebooted anyway.
if test "$runlevel" = "0" -o "$runlevel" = "6"; then
killproc xenstored > /dev/null
RETVAL=$?
else
RETVAL=1
fi
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/blktapctrl
}
rcstatus() {
status blktapctrl
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
}
RETVAL=0
case "$1" in
start)
start
;;
stop)
stop
;;
status)
rcstatus
;;
*)
echo $"Usage: $0 {start|stop|status}"
exit 1
esac
exit $RETVAL
--- NEW FILE init.xenconsoled ---
#!/bin/bash
#
# xenconsoled Script to start and stop the Xen xenconsoled daemon
#
# Author: Daniel P. Berrange <berrange at redhat.com>
#
# chkconfig: 2345 97 01
# description: Starts and stops the Xen control daemon.
### BEGIN INIT INFO
# Provides: xenconsoled
# Required-Start: $syslog $remote_fs
# Should-Start:
# Required-Stop: $syslog $remote_fs
# Should-Stop:
# Default-Start: 3 4 5
# Default-Stop: 0 1 2 6
# Default-Enabled: yes
# Short-Description: Start/stop xenconsoled
# Description: Starts and stops the Xen xenconsoled daemon.
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
if [ ! -d /proc/xen ]; then
exit 0
fi
if ! grep -q "control_d" /proc/xen/capabilities ; then
exit 0
fi
# Default config params
XENCONSOLED_LOG_HYPERVISOR=no
XENCONSOLED_LOG_GUESTS=no
XENCONSOLED_LOG_DIR=/var/log/xen/console
XENCONSOLED_ARGS=
# User customized params
test -f /etc/sysconfig/xenconsoled && . /etc/sysconfig/xenconsoled
XENCONSOLED_LOG=none
if [ "$XENCONSOLED_LOG_HYPERVISOR" = "yes" ]
then
if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ]
then
XENCONSOLED_LOG=all
else
XENCONSOLED_LOG=hv
fi
else
if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ]
then
XENCONSOLED_LOG=guest
fi
fi
start() {
echo -n $"Starting xenconsoled daemon: "
/usr/sbin/xenconsoled --log=$XENCONSOLED_LOG --log-dir=$XENCONSOLED_LOG_DIR $XENCONSOLED_ARGS
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenconsoled
}
stop() {
echo -n $"Stopping xenconsoled daemon: "
killproc xenconsoled > /dev/null
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenconsoled
}
rcstatus() {
status xenconsoled
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
}
reload() {
echo -n $"Reloading xenconsoled daemon: "
killproc xenconsoled -HUP > /dev/null
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
}
RETVAL=0
case "$1" in
start)
start
;;
stop)
stop
;;
status)
rcstatus
;;
reload)
reload
;;
restart|force-reload)
stop
start
;;
condrestart)
if [ -f /var/lock/subsys/xenconsoled ]
then
stop
start
fi
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
exit 1
esac
exit $RETVAL
--- NEW FILE init.xend ---
#!/bin/bash
#
# xend Script to start and stop the Xen control daemon.
#
# Author: Keir Fraser <keir.fraser at cl.cam.ac.uk>
#
# chkconfig: 2345 98 01
# description: Starts and stops the Xen control daemon.
### BEGIN INIT INFO
# Provides: xend
# Required-Start: $syslog $remote_fs
# Should-Start:
# Required-Stop: $syslog $remote_fs
# Should-Stop:
# Default-Start: 3 4 5
# Default-Stop: 0 1 2 6
# Default-Enabled: yes
# Short-Description: Start/stop xend
# Description: Starts and stops the Xen control daemon.
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
if [ ! -d /proc/xen ]; then
exit 0
fi
if ! grep -q "control_d" /proc/xen/capabilities ; then
exit 0
fi
# Default config params
start() {
echo -n $"Starting xend daemon: "
/usr/sbin/xend
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/xend
}
stop() {
echo -n $"Stopping xend daemon: "
killproc xend > /dev/null
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xend
}
rcstatus() {
status xend
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
}
reload() {
echo -n $"Reloading xend daemon: "
killproc xend -HUP > /dev/null
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
}
RETVAL=0
case "$1" in
start)
start
;;
stop)
stop
;;
status)
rcstatus
;;
reload)
reload
;;
restart|force-reload)
stop
start
;;
condrestart)
if [ -f /var/lock/subsys/xend ]
then
stop
start
fi
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
exit 1
esac
exit $RETVAL
--- NEW FILE init.xenstored ---
#!/bin/bash
#
# xenstored Script to start and stop the Xen control daemon.
#
# Author: Daniel Berrange <berrange at redhat.com
#
# chkconfig: 2345 96 01
# description: Starts and stops the Xen xenstored daemon.
### BEGIN INIT INFO
# Provides: xenstored
# Required-Start: $syslog $remote_fs
# Should-Start:
# Required-Stop: $syslog $remote_fs
# Should-Stop:
# Default-Start: 3 4 5
# Default-Stop: 0 1 2 6
# Default-Enabled: yes
# Short-Description: Start/stop xenstored
# Description: Starts and stops the Xen xenstored daemon.
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
if [ ! -d /proc/xen ]; then
exit 0
fi
if [ ! -f /proc/xen/capabilities ]; then
mount -t xenfs xen /proc/xen
fi
if ! grep -q "control_d" /proc/xen/capabilities ; then
exit 0
fi
# Default config params
XENSTORED_PID="/var/run/xenstore.pid"
XENSTORED_ARGS=
# User customized params
test -f /etc/sysconfig/xenstored && . /etc/sysconfig/xenstored
start() {
echo -n $"Starting xenstored daemon: "
grep -q '/var/lib/xenstored' /proc/mounts
if test "$?" = "1"; then
mount -t tmpfs xenstore /var/lib/xenstored
restorecon -R /var/lib/xenstored
fi
/usr/sbin/xenstored --pid-file $XENSTORED_PID $XENSTORED_ARGS
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenstored
}
stop() {
echo -n $"Stopping xenstored daemon: "
# xenstored is not restartable. So we refuse to stop it
# unless the machine is being shutdown or rebooted anyway.
if test "$runlevel" = "0" -o "$runlevel" = "6"; then
killproc xenstored > /dev/null
RETVAL=$?
else
RETVAL=1
fi
test $RETVAL = 0 && echo_success || echo_failure
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenstored
}
rcstatus() {
status xenstored
RETVAL=$?
test $RETVAL = 0 && echo_success || echo_failure
echo
}
RETVAL=0
case "$1" in
start)
start
;;
stop)
stop
;;
status)
rcstatus
;;
*)
echo $"Usage: $0 {start|stop|status}"
exit 1
esac
exit $RETVAL
--- NEW FILE sysconfig.blktapctrl ---
#BLKTAPCTRL_ARGS=
--- NEW FILE sysconfig.xenconsoled ---
# Log all hypervisor messages (cf xm dmesg)
#XENCONSOLED_LOG_HYPERVISOR=no
# Log all guest console output (cf xm console)
#XENCONSOLED_LOG_GUESTS=no
# Location to store guest & hypervisor logs
#XENCONSOLED_LOG_DIR=/var/log/xen/console
#XENCONSOLED_ARGS=
--- NEW FILE sysconfig.xenstored ---
#XENSTORED_PID="/var/run/xenstore.pid"
#XENSTORED_ARGS=
xen-configure-xend.patch:
--- NEW FILE xen-configure-xend.patch ---
diff -up xen-3.4.0/tools/examples/xend-config.sxp.config xen-3.4.0/tools/examples/xend-config.sxp
--- xen-3.4.0/tools/examples/xend-config.sxp.config 2009-05-20 17:12:50.000000000 +0200
+++ xen-3.4.0/tools/examples/xend-config.sxp 2009-05-20 17:15:35.000000000 +0200
@@ -58,11 +58,11 @@
#(xend-http-server no)
-#(xend-unix-server no)
+(xend-unix-server yes)
#(xend-tcp-xmlrpc-server no)
#(xend-unix-xmlrpc-server yes)
-#(xend-relocation-server no)
-(xend-relocation-server yes)
+(xend-relocation-server no)
+#(xend-relocation-server yes)
#(xend-relocation-ssl-server no)
#(xend-udev-event-server no)
@@ -154,7 +154,8 @@
# two fake interfaces per guest domain. To do things like this, write
# yourself a wrapper script, and call network-bridge from it, as appropriate.
#
-(network-script network-bridge)
+#(network-script network-bridge)
+(network-script /bin/true)
# 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
@@ -186,7 +187,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)
# Whether to enable auto-ballooning of dom0 to allow domUs to be created.
# If enable-dom0-ballooning = no, dom0 will never balloon out.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-11/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore 8 Jan 2009 20:18:01 -0000 1.39
+++ .cvsignore 27 May 2009 20:05:56 -0000 1.40
@@ -5,4 +5,4 @@ newlib-1.16.0.tar.gz
lwip-1.3.0.tar.gz
pciutils-2.2.9.tar.bz2
zlib-1.2.3.tar.gz
-xen-3.3.1.tar.gz
+xen-3.4.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-11/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources 8 Jan 2009 20:18:01 -0000 1.54
+++ sources 27 May 2009 20:05:57 -0000 1.55
@@ -3,4 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4 newlib
36cc57650cffda9a0269493be2a169bb lwip-1.3.0.tar.gz
cec05e7785497c5e19da2f114b934ffd pciutils-2.2.9.tar.bz2
debc62758716a169df9f62e6ab2bc634 zlib-1.2.3.tar.gz
-77a61e08875625394ef6bf80e595ffa1 xen-3.3.1.tar.gz
+bf1b29f07ec2c12673779600aea183b2 xen-3.4.0.tar.gz
xen-dumpdir.patch:
Index: xen-dumpdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-11/xen-dumpdir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xen-dumpdir.patch 29 Aug 2008 11:11:46 -0000 1.4
+++ xen-dumpdir.patch 27 May 2009 20:05:57 -0000 1.5
@@ -1,18 +1,7 @@
-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.
- 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 -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
+diff -up xen-3.4.0/tools/Makefile.dump xen-3.4.0/tools/Makefile
+--- xen-3.4.0/tools/Makefile.dump 2009-05-18 13:05:38.000000000 +0200
++++ xen-3.4.0/tools/Makefile 2009-05-20 17:03:26.000000000 +0200
+@@ -46,7 +46,7 @@ all: subdirs-all
.PHONY: install
install: subdirs-install
@@ -21,16 +10,26 @@ diff -rup xen-3.3.0-orig/tools/Makefile
$(INSTALL_DIR) $(DESTDIR)/var/log/xen
$(INSTALL_DIR) $(DESTDIR)/var/lib/xen
-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())
-- 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)
+diff -up xen-3.4.0/tools/debugger/gdb/README.dump xen-3.4.0/tools/debugger/gdb/README
+--- xen-3.4.0/tools/debugger/gdb/README.dump 2009-05-18 13:05:38.000000000 +0200
++++ xen-3.4.0/tools/debugger/gdb/README 2009-05-20 17:03:26.000000000 +0200
+@@ -33,6 +33,6 @@ To debug a crashed domU guest:
+ 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 -up xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py
+--- xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py.dump 2009-05-18 13:05:38.000000000 +0200
++++ xen-3.4.0/tools/python/xen/xend/XendDomainInfo.py 2009-05-20 17:03:56.000000000 +0200
+@@ -2096,7 +2096,7 @@ class XendDomainInfo:
+
+ 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):
-Only in xen-3.3.0-new/tools/python/xen/xend: XendDomainInfo.py.orig
+ if os.path.isdir(corefile):
xen-initscript.patch:
Index: xen-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-11/xen-initscript.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xen-initscript.patch 29 Aug 2008 11:11:47 -0000 1.11
+++ xen-initscript.patch 27 May 2009 20:05:57 -0000 1.12
@@ -1,468 +1,7 @@
-diff -rupN xen-3.2.0.orig/tools/examples/init.d/blktapctrl xen-3.2.0.new/tools/examples/init.d/blktapctrl
---- xen-3.2.0.orig/tools/examples/init.d/blktapctrl 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/init.d/blktapctrl 2008-02-01 17:45:49.000000000 -0500
-@@ -0,0 +1,80 @@
-+#!/bin/bash
-+#
-+# blktapctrl Script to start the Xen blktapctrl daemon
-+#
-+# Author: Daniel Berrange <berrange at redhat.com>
-+#
-+# chkconfig: 2345 97 01
-+# description: Starts and stops the Xen blktapctrl daemon.
-+### BEGIN INIT INFO
-+# Provides: blktapctrl
-+# Required-Start: $syslog $remote_fs
-+# Should-Start:
-+# Required-Stop: $syslog $remote_fs
-+# Should-Stop:
-+# Default-Start: 3 4 5
-+# Default-Stop: 0 1 2 6
-+# Default-Enabled: yes
-+# Short-Description: Start/stop blktapctrl
-+# Description: Starts and stops the Xen blktapctrl daemon
-+### END INIT INFO
-+
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+if [ ! -d /proc/xen ]; then
-+ exit 0
-+fi
-+if ! grep -q "control_d" /proc/xen/capabilities ; then
-+ exit 0
-+fi
-+
-+# Default config params
-+BLKTAPCTRL_ARGS=
-+
-+# User customized params
-+test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl
-+
-+start() {
-+ echo -n $"Starting xen blktapctrl daemon: "
-+ /usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl
-+}
-+
-+stop() {
-+ echo -n $"Stoping xen blktapctrl daemon: "
-+ # Refuse to stop blktapctrl as it'll kill all guests
-+ RETVAL=1
-+ echo_failure
-+ echo
-+}
-+
-+rcstatus() {
-+ status blktapctrl
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+}
-+
-+
-+RETVAL=0
-+case "$1" in
-+ start)
-+ start
-+ ;;
-+ stop)
-+ stop
-+ ;;
-+ status)
-+ rcstatus
-+ ;;
-+ *)
-+ echo $"Usage: $0 {start|stop|status}"
-+ exit 1
-+esac
-+
-+exit $RETVAL
-+
-diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.blktapctrl xen-3.2.0.new/tools/examples/init.d/sysconfig.blktapctrl
---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.blktapctrl 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.blktapctrl 2008-02-01 17:49:46.000000000 -0500
-@@ -0,0 +1 @@
-+#BLKTAPCTRL_ARGS=
-diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenconsoled xen-3.2.0.new/tools/examples/init.d/sysconfig.xenconsoled
---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenconsoled 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.xenconsoled 2008-02-01 17:49:56.000000000 -0500
-@@ -0,0 +1,12 @@
-+
-+# Log all hypervisor messages (cf xm dmesg)
-+#XENCONSOLED_LOG_HYPERVISOR=no
-+
-+# Log all guest console output (cf xm console)
-+#XENCONSOLED_LOG_GUESTS=no
-+
-+# Location to store guest & hypervisor logs
-+#XENCONSOLED_LOG_DIR=/var/log/xen/console
-+
-+#XENCONSOLED_ARGS=
-+
-diff -rupN xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenstored xen-3.2.0.new/tools/examples/init.d/sysconfig.xenstored
---- xen-3.2.0.orig/tools/examples/init.d/sysconfig.xenstored 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/init.d/sysconfig.xenstored 2008-02-01 17:50:02.000000000 -0500
-@@ -0,0 +1,4 @@
-+
-+#XENSTORED_PID="/var/run/xenstore.pid"
-+#XENSTORED_ARGS=
-+
-diff -rupN xen-3.2.0.orig/tools/examples/init.d/xenconsoled xen-3.2.0.new/tools/examples/init.d/xenconsoled
---- xen-3.2.0.orig/tools/examples/init.d/xenconsoled 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/init.d/xenconsoled 2008-02-01 18:07:00.000000000 -0500
-@@ -0,0 +1,121 @@
-+#!/bin/bash
-+#
-+# xenconsoled Script to start and stop the Xen xenconsoled daemon
-+#
-+# Author: Daniel P. Berrange <berrange at redhat.com>
-+#
-+# chkconfig: 2345 97 01
-+# description: Starts and stops the Xen control daemon.
-+### BEGIN INIT INFO
-+# Provides: xenconsoled
-+# Required-Start: $syslog $remote_fs
-+# Should-Start:
-+# Required-Stop: $syslog $remote_fs
-+# Should-Stop:
-+# Default-Start: 3 4 5
-+# Default-Stop: 0 1 2 6
-+# Default-Enabled: yes
-+# Short-Description: Start/stop xenconsoled
-+# Description: Starts and stops the Xen xenconsoled daemon.
-+### END INIT INFO
-+
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+if [ ! -d /proc/xen ]; then
-+ exit 0
-+fi
-+if ! grep -q "control_d" /proc/xen/capabilities ; then
-+ exit 0
-+fi
-+
-+# Default config params
-+XENCONSOLED_LOG_HYPERVISOR=no
-+XENCONSOLED_LOG_GUESTS=no
-+XENCONSOLED_LOG_DIR=/var/log/xen/console
-+XENCONSOLED_ARGS=
-+
-+# User customized params
-+test -f /etc/sysconfig/xenconsoled && . /etc/sysconfig/xenconsoled
-+
-+XENCONSOLED_LOG=none
-+if [ "$XENCONSOLED_LOG_HYPERVISOR" = "yes" ]
-+then
-+ if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ]
-+ then
-+ XENCONSOLED_LOG=all
-+ else
-+ XENCONSOLED_LOG=hv
-+ fi
-+else
-+ if [ "$XENCONSOLED_LOG_GUESTS" = "yes" ]
-+ then
-+ XENCONSOLED_LOG=guest
-+ fi
-+fi
-+
-+start() {
-+ echo -n $"Starting xenconsoled daemon: "
-+ /usr/sbin/xenconsoled --log=$XENCONSOLED_LOG --log-dir=$XENCONSOLED_LOG_DIR $XENCONSOLED_ARGS
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenconsoled
-+}
-+
-+stop() {
-+ echo -n $"Stopping xenconsoled daemon: "
-+ killproc xenconsoled > /dev/null
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenconsoled
-+}
-+
-+rcstatus() {
-+ status xenconsoled
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+}
-+
-+reload() {
-+ echo -n $"Reloading xenconsoled daemon: "
-+ killproc xenconsoled -HUP > /dev/null
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+}
-+
-+RETVAL=0
-+case "$1" in
-+ start)
-+ start
-+ ;;
-+ stop)
-+ stop
-+ ;;
-+ status)
-+ rcstatus
-+ ;;
-+ reload)
-+ reload
-+ ;;
-+ restart|force-reload)
-+ stop
-+ start
-+ ;;
-+ condrestart)
-+ if [ -f /var/lock/subsys/xenconsoled ]
-+ then
-+ stop
-+ start
-+ fi
-+ ;;
-+ *)
-+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
-+ exit 1
-+esac
-+
-+exit $RETVAL
-+
-diff -rupN xen-3.2.0.orig/tools/examples/init.d/xend xen-3.2.0.new/tools/examples/init.d/xend
---- xen-3.2.0.orig/tools/examples/init.d/xend 2008-02-01 17:13:01.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/init.d/xend 2008-02-01 17:45:22.000000000 -0500
-@@ -19,48 +19,79 @@
- # Description: Starts and stops the Xen control daemon.
- ### END INIT INFO
-
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+if [ ! -d /proc/xen ]; then
-+ exit 0
-+fi
- if ! grep -q "control_d" /proc/xen/capabilities ; then
- exit 0
- fi
-
--# Wait for Xend to be up
--function await_daemons_up
--{
-- i=1
-- rets=10
-- xend status
-- while [ $? -ne 0 -a $i -lt $rets ]; do
-- sleep 1
-- echo -n .
-- i=$(($i + 1))
-- xend status
-- done
-+# Default config params
-+start() {
-+ echo -n $"Starting xend daemon: "
-+ /usr/sbin/xend
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xend
-+}
-+
-+stop() {
-+ echo -n $"Stopping xend daemon: "
-+ killproc xend > /dev/null
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xend
- }
-
-+rcstatus() {
-+ status xend
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+}
-+
-+reload() {
-+ echo -n $"Reloading xend daemon: "
-+ killproc xend -HUP > /dev/null
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+}
-+
-+RETVAL=0
- case "$1" in
- start)
-- xend start
-- await_daemons_up
-+ start
- ;;
- stop)
-- xend stop
-+ stop
- ;;
- status)
-- xend status
-+ rcstatus
- ;;
- reload)
-- xend reload
-+ reload
- ;;
- restart|force-reload)
-- xend restart
-- await_daemons_up
-+ stop
-+ start
- ;;
-+ condrestart)
-+ if [ -f /var/lock/subsys/xend ]
-+ then
-+ stop
-+ start
-+ fi
-+ ;;
- *)
-- # do not advertise unreasonable commands that there is no reason
-- # to use with this device
-- echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}"
-+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
- exit 1
- esac
-
--exit $?
-+exit $RETVAL
-
-diff -rupN xen-3.2.0.orig/tools/examples/init.d/xenstored xen-3.2.0.new/tools/examples/init.d/xenstored
---- xen-3.2.0.orig/tools/examples/init.d/xenstored 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/init.d/xenstored 2008-02-01 18:06:42.000000000 -0500
-@@ -0,0 +1,83 @@
-+#!/bin/bash
-+#
-+# xenstored Script to start and stop the Xen control daemon.
-+#
-+# Author: Daniel Berrange <berrange at redhat.com
-+#
-+# chkconfig: 2345 96 01
-+# description: Starts and stops the Xen xenstored daemon.
-+### BEGIN INIT INFO
-+# Provides: xenstored
-+# Required-Start: $syslog $remote_fs
-+# Should-Start:
-+# Required-Stop: $syslog $remote_fs
-+# Should-Stop:
-+# Default-Start: 3 4 5
-+# Default-Stop: 0 1 2 6
-+# Default-Enabled: yes
-+# Short-Description: Start/stop xenstored
-+# Description: Starts and stops the Xen control daemon.
-+### END INIT INFO
-+
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+if [ ! -d /proc/xen ]; then
-+ exit 0
-+fi
-+if ! grep -q "control_d" /proc/xen/capabilities ; then
-+ exit 0
-+fi
-+
-+# Default config params
-+XENSTORED_PID="/var/run/xenstore.pid"
-+XENSTORED_ARGS=
-+
-+# User customized params
-+test -f /etc/sysconfig/xenstored && . /etc/sysconfig/xenstored
-+
-+start() {
-+ echo -n $"Starting xenstored daemon: "
-+ /usr/sbin/xenstored --pid-file $XENSTORED_PID $XENSTORED_ARGS
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/xenstored
-+}
-+
-+stop() {
-+ echo -n $"Stopping xenstored daemon: "
-+
-+ # NB not safe to stop xenstored, if guests are active
-+ # or backend driver modules are loaded, so we refuse
-+ RETVAL=1
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/xenstored
-+}
-+
-+rcstatus() {
-+ status xenstored
-+ RETVAL=$?
-+ test $RETVAL = 0 && echo_success || echo_failure
-+ echo
-+}
-+
-+RETVAL=0
-+case "$1" in
-+ start)
-+ start
-+ ;;
-+ stop)
-+ stop
-+ ;;
-+ status)
-+ rcstatus
-+ ;;
-+ *)
-+ echo $"Usage: $0 {start|stop|status}"
-+ exit 1
-+esac
-+
-+exit $RETVAL
-+
-diff -rupN xen-3.2.0.orig/tools/examples/Makefile xen-3.2.0.new/tools/examples/Makefile
---- xen-3.2.0.orig/tools/examples/Makefile 2008-01-16 13:34:59.000000000 -0500
-+++ xen-3.2.0.new/tools/examples/Makefile 2008-02-01 18:06:08.000000000 -0500
-@@ -3,6 +3,12 @@ include $(XEN_ROOT)/tools/Rules.mk
-
- # Init scripts.
- XEND_INITD = init.d/xend
-+BLKTAPCTRL_INITD = init.d/blktapctrl
-+BLKTAPCTRL_SYSCONFIG = init.d/sysconfig.blktapctrl
-+XENCONSOLED_INITD = init.d/xenconsoled
-+XENCONSOLED_SYSCONFIG = init.d/sysconfig.xenconsoled
-+XENSTORED_INITD = init.d/xenstored
-+XENSTORED_SYSCONFIG = init.d/sysconfig.xenstored
- XENDOMAINS_INITD = init.d/xendomains
- XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
-
-@@ -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
-+ $(INSTALL_PROG) $(BLKTAPCTRL_INITD) $(DESTDIR)/etc/init.d
-+ $(INSTALL_PROG) $(BLKTAPCTRL_SYSCONFIG) $(DESTDIR)/etc/sysconfig/blktapctrl
-+ $(INSTALL_PROG) $(XENCONSOLED_INITD) $(DESTDIR)/etc/init.d
-+ $(INSTALL_PROG) $(XENCONSOLED_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xenconsoled
-+ $(INSTALL_PROG) $(XENSTORED_INITD) $(DESTDIR)/etc/init.d
-+ $(INSTALL_PROG) $(XENSTORED_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xenstored
- $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
-
-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 @@
+diff -up xen-3.4.0/tools/misc/xend.fix xen-3.4.0/tools/misc/xend
+--- xen-3.4.0/tools/misc/xend.fix 2009-05-20 15:39:12.000000000 +0200
++++ xen-3.4.0/tools/misc/xend 2009-05-20 15:40:32.000000000 +0200
+@@ -8,140 +8,16 @@
"""Xen management daemon.
Provides console server and HTTP management api.
@@ -477,7 +16,7 @@ diff -rup xen-3.3.0.orig/tools/misc/xend
-
The daemon should reconnect to device control interfaces
and recover its state when restarted.
--
+
- On Solaris, the daemons are SMF managed, and you should not attempt
- to start xend by hand.
"""
@@ -491,14 +30,6 @@ diff -rup xen-3.3.0.orig/tools/misc/xend
-import time
-import commands
-
--xpp = os.path.join(os.path.dirname(sys.argv[0]), 'xen-python-path')
--if os.path.exists(xpp):
-- result = commands.getstatusoutput(xpp)
-- if result[0] != 0:
-- print >>sys.stderr, result[1]
-- sys.exit(1)
-- sys.path.append(result[1])
-
from xen.xend.server import SrvDaemon
-class CheckError(ValueError):
@@ -612,10 +143,10 @@ diff -rup xen-3.3.0.orig/tools/misc/xend
if __name__ == '__main__':
sys.exit(main())
-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 = {
+diff -up xen-3.4.0/tools/python/xen/xend/osdep.py.fix xen-3.4.0/tools/python/xen/xend/osdep.py
+--- xen-3.4.0/tools/python/xen/xend/osdep.py.fix 2009-05-18 13:05:38.000000000 +0200
++++ xen-3.4.0/tools/python/xen/xend/osdep.py 2009-05-20 15:39:18.000000000 +0200
+@@ -27,7 +27,7 @@ _scripts_dir = {
_xend_autorestart = {
"NetBSD": True,
@@ -624,10 +155,10 @@ diff -rup xen-3.3.0.orig/tools/python/xe
"SunOS": False,
}
-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:
+diff -up xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py
+--- xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix 2009-05-18 13:05:38.000000000 +0200
++++ xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py 2009-05-20 15:39:18.000000000 +0200
+@@ -110,7 +110,14 @@ class Daemon:
# Fork, this allows the group leader to exit,
# which means the child can never again regain control of the
# terminal
xen-net-disable-iptables-on-bridge.patch:
Index: xen-net-disable-iptables-on-bridge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-11/xen-net-disable-iptables-on-bridge.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xen-net-disable-iptables-on-bridge.patch 29 Aug 2008 11:11:47 -0000 1.3
+++ xen-net-disable-iptables-on-bridge.patch 27 May 2009 20:05:57 -0000 1.4
@@ -1,6 +1,5 @@
-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
+--- xen-3.3.0-orig/tools/hotplug/Linux/vif-bridge 2008-08-22 10:49:07.000000000 +0100
++++ xen-3.3.0-new/tools/hotplug/Linux/vif-bridge 2008-08-29 11:29:38.000000000 +0100
@@ -91,8 +91,6 @@ case "$command" in
;;
esac
@@ -10,9 +9,8 @@ diff -rup xen-3.3.0-orig/tools/examples/
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
+--- xen-3.3.0-orig/tools/hotplug/Linux/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100
++++ xen-3.3.0-new/tools/hotplug/Linux/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
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/F-11/xen.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- xen.spec 10 Mar 2009 12:15:50 -0000 1.236
+++ xen.spec 27 May 2009 20:05:57 -0000 1.237
@@ -1,91 +1,42 @@
%{!?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.3.1
-%define base_release 11
-
# Hypervisor ABI
-%define hv_abi 3.3
-# Whether to build -hypervisor pacakges
-%define hv_build 1
-
-# For testing upstream dev trees run either
-# hg archive -t tgz ../xen-unstable-[changeset].tgz
-# Or
-# hg archive -t tgz ../xen-3.1-testing-[changeset].tgz
-#
-# And set 'base_version' the release number that the current
-# dev tree is targetted to become,
-
-# For dev trees, also set the changeset synced to
-#define changeset 16701
-
-# Name of the tree (ie the arg to hg archive, without .tgz suffix)
-#define tree unstable
-#define tree 3.1-testing
-
-# If upstream tree is also in release candidate stage, add this tag
-#define relcandidate 5
-
-
-
-# Don't change the following - they're all set based on the above params
-#
-# For prod RPMs we end up with a
-# xen-3.1.2-1.fc9.i686.rpm
-#
-# For dev RPMs we end up with a
-# xen-3.2.0-0.fc9.rc1.dev16606.i686.rpm
-#
-# NB, the leading '0' in the release ensures it is older than
-# the first prod RPM for 3.2.0
-
-
-%define release_prefix %{?changeset:0}%{!?changeset:%{base_release}}
-%define release_postfix %{?changeset:%{?relcandidate:.rc%{relcandidate}}.dev%{changeset}.%{base_release}}
-%define version_tag %{base_version}
-%define release_tag %{release_prefix}%{?dist}%{release_postfix}
-%define directory_tag xen-%{?changeset:%{tree}-%{changeset}}%{!?tree:%{base_version}}
-%define source_tag %{directory_tag}.tar.gz
-
+%define hv_abi 3.4
Summary: Xen is a virtual machine monitor
Name: xen
-Version: %{version_tag}
-Release: %{release_tag}
+Version: 3.4.0
+Release: 1%{?dist}
Group: Development/Libraries
License: GPLv2+ and LGPLv2+ and BSD
URL: http://xen.org/
-Source0: %{source_tag}
+Source0: http://bits.xensource.com/oss-xen/release/3.4.0/xen-3.4.0.tar.gz
Source1: %{name}.modules
Source2: %{name}.logrotate
+Source3: dom0-kernel.repo
# used by stubdoms
Source10: lwip-1.3.0.tar.gz
Source11: newlib-1.16.0.tar.gz
Source12: zlib-1.2.3.tar.gz
Source13: pciutils-2.2.9.tar.bz2
Source14: grub-0.97.tar.gz
+# init.d bits
+Source20: init.xenstored
+Source21: init.xenconsoled
+Source22: init.blktapctrl
+Source23: init.xend
+# sysconfig bits
+Source30: sysconfig.xenstored
+Source31: sysconfig.xenconsoled
+Source32: sysconfig.blktapctrl
+
Patch1: xen-initscript.patch
-Patch2: xen-initscript-pvops.patch
-Patch3: xen-fix-deprecated-warnings.patch
-Patch8: xen-xenstore-cli.patch
-Patch13: xen-dumpdir.patch
-Patch14: xen-net-disable-bridge-by-default.patch
-Patch15: xen-net-disable-iptables-on-bridge.patch
-Patch16: xen-gcc44-buildfix.patch
-Patch17: xen-xenstored-fix.diff
-Patch20: xen-backport-hg18782.patch
-Patch21: xen-backport-hg19075.patch
-Patch22: xen-backport-hg19108.patch
-Patch23: xen-backport-hg19109.patch
-Patch24: xen-backport-hg19110.patch
-Patch30: xen-qemu-dm-unplug.diff
-
-
-# Patches to modify the default config of xend
-Patch100: xen-config-dom0-minmem.patch
-Patch102: xen-3.0.2-config-allow-unix-server.patch
-Patch103: xen-3.0.2-config-disable-reloc.patch
+Patch2: xen-fix-deprecated-warnings.patch
+Patch3: xen-xenstore-cli.patch
+Patch4: xen-dumpdir.patch
+Patch5: xen-net-disable-iptables-on-bridge.patch
+
+Patch100: xen-configure-xend.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
@@ -136,7 +87,7 @@ which manage Xen virtual machines.
Summary: Core Xen runtime environment
Group: Development/Libraries
Requires: xen-libs = %{version}-%{release}
-Requires: /usr/bin/qemu-img
+Requires: /usr/bin/qemu-img /usr/bin/qemu-nbd
# 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}
@@ -146,7 +97,6 @@ This package contains the runtime progra
form the core Xen userspace environment.
-%if %{hv_build}
%package hypervisor
Summary: Libraries for Xen tools
Group: Development/Libraries
@@ -154,7 +104,15 @@ Provides: xen-hypervisor-abi = %{hv_abi}
%description hypervisor
This package contains the Xen hypervisor
-%endif
+
+
+%package doc
+Summary: Xen documentation
+Group: Development/Libraries
+
+%description doc
+This package contains the Xen documentation.
+
%package devel
Summary: Development libraries for Xen tools
@@ -165,140 +123,127 @@ Requires: xen-libs = %{version}-%{releas
This package contains what's needed to develop applications
which manage Xen virtual machines.
+
%prep
-%setup -q -n %{directory_tag}
+%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch8 -p1
-
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-
-cd tools/ioemu-qemu-xen
-%patch30 -p1
-cd ../../
+%patch4 -p1
+%patch5 -p1
-# config patches
%patch100 -p1
-%patch102 -p1
-%patch103 -p1
# stubdom sources
cp -v %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
+
%build
-export XEN_VENDORVERSION="-%{release_tag}"
-%if %{hv_build}
-CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs xen
-%{__make} stubdom
-%else
-CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
-%{__make} stubdom
-%endif
+export XEN_VENDORVERSION="-%{release}"
+export CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} prefix=/usr dist-xen
+make %{?_smp_mflags} prefix=/usr dist-tools
+make %{?_smp_mflags} prefix=/usr dist-docs
+unset CFLAGS
+make dist-stubdom
+
%install
rm -rf %{buildroot}
-make XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-tools install-docs install-stubdom
-mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/domain
-mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/vnet
-mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/migrate
-mkdir -p %{buildroot}%{_localstatedir}/lib/xenstored
-mkdir -p %{buildroot}%{_localstatedir}/run/xenstored
-
-rm -rf %{buildroot}%{_sysconfdir}/hotplug
-
-# install all of the public headers
-mkdir -p %{buildroot}%{_includedir}/xen/io %{buildroot}%{_includedir}/xen/hvm
-mkdir -p %{buildroot}%{_includedir}/xen/arch-x86 %{buildroot}%{_includedir}/xen/xsm
-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/xsm/*.h %{buildroot}%{_includedir}/xen/xsm
-install -m 644 xen/include/public/arch-x86/*.h %{buildroot}%{_includedir}/xen/arch-x86
-install -m 644 xen/include/public/*.h %{buildroot}%{_includedir}/xen/
-
-%if %{hv_build}
-# install the hypervisor
-install -d 755 %{buildroot}/boot/
-install -m 644 xen/xen.gz %{buildroot}/boot/xen-%{hv_abi}.gz
-install -m 644 xen/xen-syms %{buildroot}/boot/xen-syms-%{hv_abi}
-%endif
+make DESTDIR=%{buildroot} prefix=/usr install-xen
+make DESTDIR=%{buildroot} prefix=/usr install-tools
+make DESTDIR=%{buildroot} prefix=/usr install-docs
+make DESTDIR=%{buildroot} prefix=/usr install-stubdom
-### fixing start-script dir
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d
-mv -f %{buildroot}%{_sysconfdir}/init.d %{buildroot}%{_sysconfdir}/rc.d/
+############ debug packaging: list files ############
-mv -f %{buildroot}%{_sysconfdir}/udev/xen-backend.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
+find %{buildroot} -print | xargs ls -ld | sed -e 's|.*%{buildroot}||' > f1.list
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/modules
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/modules/%{name}.modules
+############ kill unwanted stuff ############
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
-install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+# stubdom: newlib
+rm -rf %{buildroot}/usr/*-xen-elf
+
+# hypervisor symlinks
+rm -rf %{buildroot}/boot/xen-3.4.gz
+rm -rf %{buildroot}/boot/xen-3.gz
# silly doc dir fun
rm -fr %{buildroot}%{_datadir}/doc/xen
rm -rf %{buildroot}%{_datadir}/doc/qemu
-# Pointless wrapper
-rm -f %{buildroot}%{_libdir}/%{name}/bin/qemu-dm.debug
# Pointless helper
rm -f %{buildroot}%{_sbindir}/xen-python-path
-# Just plain evil
-rm -f %{buildroot}%{_sbindir}/netfix
-
-# Tools that upstream are dropping
-# ...replaced by kpartx
-rm -f %{buildroot}%{_bindir}/lomount
-# ...replaced by any serial console program
-rm -f %{buildroot}%{_bindir}/xencons
-
-# Not built into our Xen kernels
-rm -f %{buildroot}%{_bindir}/xenperf
-rm -f %{buildroot}%{_sbindir}/xenperf
-
-# Doesn't work
-rm -f %{buildroot}%{_sbindir}/xsview
-
-# create dirs in /var/run so that selinux contexts are right (#195952)
-mkdir -p %{buildroot}%{_localstatedir}/run/xend
-mkdir -p %{buildroot}%{_localstatedir}/run/xend/boot
-mkdir -p %{buildroot}%{_localstatedir}/log/xen
-mkdir -p %{buildroot}%{_localstatedir}/log/xen/console
-mkdir -p %{buildroot}%{_localstatedir}/lib/xen/images
-# 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
+# qemu stuff (unused or available from upstream)
+rm -rf %{buildroot}/usr/share/xen/man
+rm -rf %{buildroot}/usr/bin/qemu-*-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
+ln -s qemu-img %{buildroot}/%{_bindir}/qemu-nbd-xen
+for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \
+ pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \
+ vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb
do
- rm -f %{buildroot}/%{_datadir}/xen/qemu/$i
+ rm -f %{buildroot}/%{_datadir}/xen/qemu/$file
done
-# blow away README's not intended for end users
+# README's not intended for end users
rm -f %{buildroot}/%{_sysconfdir}/xen/README*
-#find_lang xen-xm
+############ fixup files in /etc ############
+
+# udev
+rm -rf %{buildroot}/etc/udev/rules.d/xen*.rules
+mv %{buildroot}/etc/udev/xen*.rules %{buildroot}/etc/udev/rules.d
+
+# modules
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/modules
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/modules/%{name}.modules
+
+# logrotate
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+# init scripts
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+mv %{buildroot}%{_sysconfdir}/init.d/* %{buildroot}%{_sysconfdir}/rc.d/init.d
+rmdir %{buildroot}%{_sysconfdir}/init.d
+install -m 755 %{SOURCE20} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenstored
+install -m 755 %{SOURCE21} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenconsoled
+install -m 755 %{SOURCE22} %{buildroot}%{_sysconfdir}/rc.d/init.d/blktapctrl
+install -m 755 %{SOURCE23} %{buildroot}%{_sysconfdir}/rc.d/init.d/xend
+
+# sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/sysconfig/xenstored
+install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled
+install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
+
+############ fixup info files ############
+
+mkdir -p %{buildroot}/usr/share/info
+mv %{buildroot}/usr/info/*info* %{buildroot}/usr/share/info
+rmdir %{buildroot}/usr/info
+
+############ create dirs in /var ############
+
+mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/domain
+mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/vnet
+mkdir -p %{buildroot}%{_localstatedir}/lib/xen/xend-db/migrate
+mkdir -p %{buildroot}%{_localstatedir}/lib/xen/images
+mkdir -p %{buildroot}%{_localstatedir}/log/xen/console
+
+############ add pointer to kernels ############
+
+mkdir -p %{buildroot}%{_sysconfdir}/yum.repos.d
+cp %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d
+
+############ debug packaging: list files ############
+
+find %{buildroot} -print | xargs ls -ld | sed -e 's|.*%{buildroot}||' > f2.list
+diff -u f1.list f2.list || true
+
+############ all done now ############
%post
/sbin/chkconfig --add xend
@@ -334,29 +279,22 @@ fi
%postun libs -p /sbin/ldconfig
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
# Base package only contains XenD/xm python stuff
#files -f xen-xm.lang
%files
%defattr(-,root,root)
%doc COPYING README
-#doc docs/pdf/
-%doc docs/misc/
+%{_bindir}/xencons
%{_sbindir}/xend
%{_sbindir}/xm
-# XenD / xm python code
%{python_sitearch}/%{name}
-%if 0%fedora > 8
%{python_sitearch}/xen-*.egg-info
-%endif
%{_mandir}/man1/xm.1*
%{_mandir}/man5/xend-config.sxp.5*
%{_mandir}/man5/xmdomain.cfg.5*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*.dtd
-
# Startup script
%{_sysconfdir}/rc.d/init.d/xend
%{_sysconfdir}/rc.d/init.d/xendomains
@@ -377,12 +315,14 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_localstatedir}/lib/%{name}/xend-db/migrate
%dir %{_localstatedir}/lib/%{name}/xend-db/vnet
+# pointer to dom0 kernel
+%config(noreplace) %{_sysconfdir}/yum.repos.d/dom0-kernel.repo
+
%files libs
%defattr(-,root,root)
%{_libdir}/*.so.*
%{_libdir}/fs/*
-
# All runtime stuff except for XenD/xm python stuff
%files runtime
%defattr(-,root,root)
@@ -424,22 +364,20 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitearch}/fsimage.so
%{python_sitearch}/grub
-%if 0%fedora > 8
%{python_sitearch}/pygrub-*.egg-info
-%endif
# The firmware
%ifnarch ia64
# Avoid owning /usr/lib twice on i386
%if "%{_libdir}" != "/usr/lib"
%dir /usr/lib/%{name}
-%endif
%dir /usr/lib/%{name}/bin
+/usr/lib/%{name}/bin/stubdom-dm
+%endif
%dir /usr/lib/%{name}/boot
# HVM loader is always in /usr/lib regardless of multilib
-/usr/lib/xen/bin/stubdom-dm
-/usr/lib/xen/boot/ioemu-stubdom.gz
/usr/lib/xen/boot/hvmloader
+/usr/lib/xen/boot/ioemu-stubdom.gz
/usr/lib/xen/boot/pv-grub*.gz
%endif
# General Xen state
@@ -455,7 +393,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %attr(0700,root,root) %{_localstatedir}/run/xend/boot
# All xenstore CLI tools
-%{_bindir}/qemu-img-xen
+%{_bindir}/qemu-*-xen
%{_bindir}/xenstore
%{_bindir}/xenstore-*
%{_bindir}/pygrub
@@ -480,18 +418,27 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/xenbaked
%{_sbindir}/xenstored
%{_sbindir}/xenpm
+%{_sbindir}/xenpmd
+%{_sbindir}/xenperf
+%{_sbindir}/xsview
# Xen logfiles
%dir %attr(0700,root,root) %{_localstatedir}/log/xen
# Guest/HV console logs
%dir %attr(0700,root,root) %{_localstatedir}/log/xen/console
-%if %{hv_build}
%files hypervisor
%defattr(-,root,root)
/boot/xen-syms-*
/boot/xen-*.gz
-%endif
+/boot/xen.gz
+
+%files doc
+%defattr(-,root,root)
+%doc docs/misc/
+%doc dist/install/usr/share/doc/xen/html
+%doc dist/install/usr/share/doc/xen/pdf/*.pdf
+/usr/share/info/*info*
%files devel
%defattr(-,root,root)
@@ -502,6 +449,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.a
%changelog
+* Wed May 27 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.4.0-1
+- update to version 3.4.0.
+- cleanup specfile, add doc subpackage.
+
* Tue Mar 10 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.3.1-11
- fix python 2.6 warnings.
--- xen-3.0.2-config-allow-unix-server.patch DELETED ---
--- xen-3.0.2-config-disable-reloc.patch DELETED ---
--- xen-backport-hg18782.patch DELETED ---
--- xen-backport-hg19075.patch DELETED ---
--- xen-backport-hg19108.patch DELETED ---
--- xen-backport-hg19109.patch DELETED ---
--- xen-backport-hg19110.patch DELETED ---
--- xen-config-dom0-minmem.patch DELETED ---
--- xen-gcc44-buildfix.patch DELETED ---
--- xen-initscript-pvops.patch DELETED ---
--- xen-net-disable-bridge-by-default.patch DELETED ---
- Previous message (by thread): rpms/pdfchain/devel import.log, NONE, 1.1 pdfchain-desktop.patch, NONE, 1.1 pdfchain.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/pdfchain/F-10 pdfchain-desktop.patch, NONE, 1.1 pdfchain.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list