aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-01-26 14:15:01 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-01-26 14:15:01 +0000
commit5f5fb2fe3b828bba22f2a466d70179ca486af975 (patch)
tree1bfdfb69a9c4df39d65cfc4ea013cfb997fb4432
parentf30a5d2eceb2fa3d6145e7527cae7ff34cb70e49 (diff)
downloadxen-4.0.0-rc2.tar.gz
xen-4.0.0-rc2.tar.bz2
xen-4.0.0-rc2.zip
Update Xen version to 4.0.0-rc24.0.0-rc2
-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 6bfd7b75c3..4241791e62 100644
--- a/Config.mk
+++ b/Config.mk
@@ -150,7 +150,8 @@ QEMU_REMOTE=http://xenbits.xensource.com/git-http/qemu-xen-unstable.git
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= a0066d08514ecfec34c717c7184250e95519f39c
+QEMU_TAG := xen-4.0.0-rc2
+#QEMU_TAG ?= a0066d08514ecfec34c717c7184250e95519f39c
# Thu Jan 14 18:27:13 2010 +0000
# use new (replacement) mmap-batch ioctl
diff --git a/xen/Makefile b/xen/Makefile
index 5860150e2a..9479ba101d 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-rc2-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc2$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version