aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <none@none>2012-11-15 09:57:44 +0100
committerJan Beulich <none@none>2012-11-15 09:57:44 +0100
commit7e0e137a0632d4a9b7ee60f24a83baa9544a606e (patch)
tree30218eed92de59fc46c3f4263fcb2eea8202e00a
parent95a0c10357c502a0b0b960e7133e792695ef0b58 (diff)
downloadxen-7e0e137a0632d4a9b7ee60f24a83baa9544a606e.tar.gz
xen-7e0e137a0632d4a9b7ee60f24a83baa9544a606e.tar.bz2
xen-7e0e137a0632d4a9b7ee60f24a83baa9544a606e.zip
update Xen version to 4.1.4-rc14.1.4-rc1
-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 25094e6bf3..aa1ac4f965 100644
--- a/Config.mk
+++ b/Config.mk
@@ -179,7 +179,7 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= b36c42985575cd6d761d39e5770e57a1f52832ae
+QEMU_TAG ?= xen-4.1.4-rc1
# Tue Nov 13 18:25:17 2012 +0000
# mapcache: Fix invalidate if memory requested was not bucket aligned
diff --git a/xen/Makefile b/xen/Makefile
index aa88084322..21b32a814a 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 ?= .4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version