update Xen version to 4.18.4

diff --git a/Config.mk b/Config.mk
index 39fe4cef1fbb8ada8ba4ecc36c392de167d6e227..6190b31358bdb69aa3fad64b767d48a6c4c0d4b8 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -221,10 +221,10 @@ OVMF_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/ovmf.git
 OVMF_UPSTREAM_REVISION ?= ba91d0292e593df8528b66f99c1b0b14fadc8e16
 
 QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.18.1
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.18.4
 
 MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git
-MINIOS_UPSTREAM_REVISION ?= ff13dabd3099687921145a5e3e960ba8337e7488
+MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.18.4
 
 SEABIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/seabios.git
 SEABIOS_UPSTREAM_REVISION ?= rel-1.16.2

diff --git a/xen/Makefile b/xen/Makefile
index 68b14fb35675839e8060951c08a2d9bad1abc208..a4e7a2f6d177f5bb580846c5695dfdb94ed6fe38 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -6,7 +6,7 @@ this-makefile := $(call lastword,$(MAKEFILE_LIST))
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 18
-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