update Xen version to 4.5.4

diff --git a/Config.mk b/Config.mk
index cef8632937d750293750ef4b02b73eee676786b5..f0062959af2a4f28921eb7b4fa8f55a1a2e5e1f4 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-QEMU_UPSTREAM_REVISION ?= 5e40cec825a2582d8a91119c485f5130cc2648e9
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.4
 # Wed Sep 16 17:38:44 2015 +0200
 # trace: remove malloc tracing
 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
@@ -262,7 +262,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= 28c21388c2a32259cff37fc578684f994dca8c9f
+QEMU_TRADITIONAL_REVISION ?= xen-4.5.4
 # Thu May 19 19:38:35 2016 +0100
 # main loop: Big hammer to fix logfile disk DoS in Xen setups
 

diff --git a/xen/Makefile b/xen/Makefile
index 53aee620c40acf0d8b0b436cbdb870fe60f6427d..3b034c9ca7a9ee15e9f3be068786d7c528c97062 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    = 5
-export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version