From d708b695a36b4fdcd8e48e6fc8e611e010f5280b Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 6 Jul 2017 09:04:28 +0200 Subject: [PATCH] update Xen version to 4.6.6 --- Config.mk | 6 +++--- xen/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 626e7d3b37..e4f3b209f6 100644 --- a/Config.mk +++ b/Config.mk @@ -254,10 +254,10 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.5 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.6 # Wed Sep 16 17:38:44 2015 +0200 # trace: remove malloc tracing -MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.5 +MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.6 # Fri May 13 15:21:10 2016 +0100 # lib/sys.c: enclose file_types in define guards @@ -268,7 +268,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 57ca3f4a3092695dd553d3ff4540f5559b1c8fc7 +QEMU_TRADITIONAL_REVISION ?= xen-4.6.6 # Thu Mar 9 11:14:55 2017 +0000 # cirrus/vnc: zap drop bitblit support from console code. diff --git a/xen/Makefile b/xen/Makefile index acc67b9a8c..26e8eea390 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 = 6 -export XEN_EXTRAVERSION ?= .6-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .6$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version