update Xen version to 4.8.5

diff --git a/Config.mk b/Config.mk
index 306df637f158c305b0787da486ea6372459a5019..dbe1ad22fd90a00739c76c987b1ea38b05fc8798 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -277,8 +277,8 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= bc54e50e0fe03c570014f363b547426913e92449
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.8.4
-MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.8.4
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.8.5
+MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.8.5
 # Wed Sep 28 11:50:04 2016 +0200
 # minios: fix build issue with xen_*mb defines
 
@@ -289,7 +289,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.10.0
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= xen-4.8.4
+QEMU_TRADITIONAL_REVISION ?= xen-4.8.5
 
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.

diff --git a/xen/Makefile b/xen/Makefile
index 17b115b1dc0fa791d8c6a79b42ba214ab85b8312..d3e55c2d180ba01bf7da4476e16f3286d867204c 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    = 8
-export XEN_EXTRAVERSION ?= .5-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .5$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version