aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-03-23 07:31:48 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-03-23 07:31:48 +0000
commit11c3ebfd58335e66e5a3cc59f90aeb66874a6c95 (patch)
tree0a961852d6fb460dcba8fdb90a13c43b446bc367
parent3e5c1b3af9d23c61944abb0098f38593143c6f30 (diff)
downloadxen-11c3ebfd58335e66e5a3cc59f90aeb66874a6c95.tar.gz
xen-11c3ebfd58335e66e5a3cc59f90aeb66874a6c95.tar.bz2
xen-11c3ebfd58335e66e5a3cc59f90aeb66874a6c95.zip
Update Xen version to 4.0.0-rc7
-rw-r--r--Config.mk3
-rw-r--r--xen/Makefile2
2 files changed, 3 insertions, 2 deletions
diff --git a/Config.mk b/Config.mk
index 03088f3f65..f2e8d75456 100644
--- a/Config.mk
+++ b/Config.mk
@@ -153,7 +153,8 @@ QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= 73cef2cca413c17f314724c66194315038ea66c3
+QEMU_TAG := xen-4.0.0-rc7
+#QEMU_TAG ?= 73cef2cca413c17f314724c66194315038ea66c3
# Thu Mar 18 16:50:44 2010 +0000
# Allow changing CD for /dev/xvdX devices.
diff --git a/xen/Makefile b/xen/Makefile
index 2af4a92aae..23d3286430 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
# All other places this is stored (eg. compile.h) should be autogenerated.
export XEN_VERSION = 4
export XEN_SUBVERSION = 0
-export XEN_EXTRAVERSION ?= .0-rc6$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc7$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version