aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-01-10 15:41:30 +0000
committerKeir Fraser <keir@xen.org>2011-01-10 15:41:30 +0000
commita5368e4b8c2d33a645e709f73ea88ece2ec0aa57 (patch)
treee2bc26d4fbfe46cb3851d574389803ea4446534a
parentd0cf7e0fa61cad63c3f9eed124f38dd8afe481e0 (diff)
downloadxen-a5368e4b8c2d33a645e709f73ea88ece2ec0aa57.tar.gz
xen-a5368e4b8c2d33a645e709f73ea88ece2ec0aa57.tar.bz2
xen-a5368e4b8c2d33a645e709f73ea88ece2ec0aa57.zip
Update Xen version to 4.0.2-rc14.0.2-rc1
-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 bd2daaceec..21b415fa1b 100644
--- a/Config.mk
+++ b/Config.mk
@@ -167,7 +167,8 @@ endif
# CONFIG_QEMU ?= ../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a
+QEMU_TAG := xen-4.0.2-rc1
+#QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a
# Wed Jan 5 23:42:03 2011 +0000
# Change tap device mac address to prevent change of bridge's mac
diff --git a/xen/Makefile b/xen/Makefile
index ca6844549c..595d55ddb6 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 ?= .2-rc1-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version