Update Xen version to 4.2.0-rc1

diff --git a/Config.mk b/Config.mk
index 9670422deb60fc727810a155c6f75262a1aa5ff4..696858c912ab2756ceb73b4f9bc5eaba267a5d85 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 ?= 00fb2aae68e915b7f456fd5e3997ddf31339004a
+QEMU_TAG ?= xen-4.2.0-rc1
 # Mon Jul 23 17:56:13 2012 +0100
 # qemu-traditional: fix no-return-in-nonvoid-function
 

diff --git a/xen/Makefile b/xen/Makefile
index 35d491e1bc3ef1fadddc0c9156b85d3d0fdbbeab..959d8df0d194454a8072715f6335f7d452763d49 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 ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc1$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version