diff options
-rw-r--r-- | Config.mk | 4 | ||||
-rw-r--r-- | xen/Makefile | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -214,9 +214,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= bacc0d302445c75f18f4c826750fb5853b60e7ca -# Thu Sep 6 17:05:30 2012 +0100 -# Disable qemu monitor by default. The qemu monitor is an overly +QEMU_TAG ?= xen-4.2.0-rc4 # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. diff --git a/xen/Makefile b/xen/Makefile index 824f442700..9be8e8f638 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 ?= .0-rc4-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc4$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version |