aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-03-20 14:02:37 +0100
committerJan Beulich <jbeulich@suse.com>2013-03-20 14:02:37 +0100
commitd682e0a06cac7ac0834b41b4a6251b89ea7349ec (patch)
tree0b75e57f24cb72988c7fb8a1e60a9e06ce22ee1e
parent5e73e3548ce70e433a03843ac4fc21a49277baad (diff)
downloadxen-d682e0a06cac7ac0834b41b4a6251b89ea7349ec.tar.gz
xen-d682e0a06cac7ac0834b41b4a6251b89ea7349ec.tar.bz2
xen-d682e0a06cac7ac0834b41b4a6251b89ea7349ec.zip
update Xen version to 4.1.5-rc14.1.5-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 ccc66b1d18..90321850df 100644
--- a/Config.mk
+++ b/Config.mk
@@ -180,7 +180,7 @@ endif
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= 7a3a2aaa8fd1049fa0f033c5113e165900c84758
+QEMU_TAG ?= xen-4.1.5-rc1
# Thu Jan 17 15:52:16 2013 +0000
# e1000: fix compile warning introduced by security fix, and debugging
diff --git a/xen/Makefile b/xen/Makefile
index c3e06e7123..b49894f300 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 ?= .5-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .5-rc1$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version