aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-02-10 17:23:57 +0000
committerKeir Fraser <keir@xen.org>2011-02-10 17:23:57 +0000
commit4e0f60c5adb8a7e5c990d9f1308023f922664ed4 (patch)
tree05206faa04406ad1ecc9ece80573ec0b9479df65
parent1accdcc8c346905b664dbd844f0bf09ad8f1cb80 (diff)
downloadxen-4.1.0-rc4.tar.gz
xen-4.1.0-rc4.tar.bz2
xen-4.1.0-rc4.zip
Update Xen version to 4.1.0-rc44.1.0-rc4
-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 b2056daa11..bd70f244c6 100644
--- a/Config.mk
+++ b/Config.mk
@@ -185,7 +185,8 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= ad7d28519de7cdc604efefac5c22fe9f88040586
+QEMU_TAG := xen-4.1.0-rc4
+#QEMU_TAG ?= ad7d28519de7cdc604efefac5c22fe9f88040586
# Tue Feb 1 17:32:38 2011 +0000
# vnc, xen: write vnc address and password to xenstore
diff --git a/xen/Makefile b/xen/Makefile
index e69ba439f5..7c4eaddc48 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 = 1
-export XEN_EXTRAVERSION ?= .0-rc4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc4$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version