aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2012-08-23 15:05:30 +0100
committerKeir Fraser <keir@xen.org>2012-08-23 15:05:30 +0100
commit985d0f2a10dead082d0ca899d0effce6eeaa12ae (patch)
treed6f1a1d575bfcdcb404ff1f93f1a1ef510972df3
parentdb8cf0c8e881d16054578a4e159e425b73ef52bb (diff)
downloadxen-985d0f2a10dead082d0ca899d0effce6eeaa12ae.tar.gz
xen-985d0f2a10dead082d0ca899d0effce6eeaa12ae.tar.bz2
xen-985d0f2a10dead082d0ca899d0effce6eeaa12ae.zip
Update Xen version to 4.2.0-rc34.2.0-rc3
-rw-r--r--Config.mk2
-rw-r--r--xen/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Config.mk b/Config.mk
index de7bfa3737..11fc120900 100644
--- a/Config.mk
+++ b/Config.mk
@@ -214,7 +214,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= effd5676225761abdab90becac519716515c3be4
+QEMU_TAG ?= xen-4.2.0-rc3
# Tue Aug 14 15:57:49 2012 +0100
# Revert "qemu-xen-traditional: use O_DIRECT to open disk images for IDE"
diff --git a/xen/Makefile b/xen/Makefile
index 65fb8aefe5..6a6e181197 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 = 2
-export XEN_EXTRAVERSION ?= .0-rc3-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc3$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version