From 36f55f33791e40a598b93a0f1a727494b6ac8664 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 20 Mar 2013 14:01:51 +0100 Subject: update Xen version to 4.2.2-rc1 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 68c4aca866..109e3ea313 100644 --- a/Config.mk +++ b/Config.mk @@ -203,7 +203,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.2-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= 351f94ff4bf3a7795ca5b282305aa610e598eec0 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.2-rc1 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 @@ -215,7 +215,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= ad6cb8a6550d0f0550252db4e05c305086ea9a65 +QEMU_TAG ?= xen-4.2.2-rc1 # Thu Jan 17 15:52:16 2013 +0000 # e1000: fix compile warning introduced by security fix, and debugging diff --git a/xen/Makefile b/xen/Makefile index a90c72b16c..515f731527 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 = 2 -export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- cgit v1.2.3