aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-10-17 16:13:05 +0200
committerJan Beulich <jbeulich@suse.com>2013-10-17 16:13:05 +0200
commit5a4f69699e3b5730fad2f10053c5daa2b2dce044 (patch)
treea262f9f90430029cf688cd574c77f1797341840c
parent9119a3fda323be347e13ffbc8221f8fcc8c09f06 (diff)
downloadxen-staging-4.3.tar.gz
xen-staging-4.3.tar.bz2
xen-staging-4.3.zip
update Xen version to 4.3.1-rc24.3.1-rc2staging-4.3stable-4.3
-rw-r--r--Config.mk4
-rw-r--r--xen/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/Config.mk b/Config.mk
index 474e24fc93..1ca446e270 100644
--- a/Config.mk
+++ b/Config.mk
@@ -212,7 +212,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git
SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
endif
OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.0
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.1-rc2
SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3
# Wed Jun 26 16:30:45 2013 +0100
# xen: Don't perform SMP setup.
@@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
CONFIG_QEMU ?= $(QEMU_REMOTE)
-QEMU_TAG ?= 0bd3d991be73031b8d9c07ccf43e5785ca26ca71
+QEMU_TAG ?= xen-4.3.1-rc2
# Thu Jul 25 08:11:55 2013 +0000
# passthrough: Correctly expose PCH ISA bridge for IGD passthrough
diff --git a/xen/Makefile b/xen/Makefile
index 7b1877901a..5f698c8aca 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 = 3
-export XEN_EXTRAVERSION ?= .1-rc1$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .1-rc2$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version