Update Xen version to 4.2.0-rc2

diff --git a/Config.mk b/Config.mk
index 89b5adcbc2355a99aa6b2d009764f318bffbf481..f3f1b7910f7d3c4936bafeb6d50f7c3f1741764a 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -213,7 +213,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
 # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG ?= d94efd9aa814f17f3243dae91476dc42b5ad052e
+QEMU_TAG ?= xen-4.2.0-rc2
 # Tue Aug 7 18:17:27 2012 +0100
 # mapcache: Fix invalidate if memory requested was not bucket aligned
 

diff --git a/xen/Makefile b/xen/Makefile
index f6cbb9a5834318baa85b62c30856c94080401c19..c8cddea391c808b1c76aed16d6125c6c4e9dce1a 100644 (file)
--- 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-rc2-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc2$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version