This commit is contained in:
committed by
Git OBS Bridge
parent
f5d6338f4d
commit
8cefe055e5
@@ -2,7 +2,24 @@ Index: xen-3.3.0-testing/Config.mk
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/Config.mk
|
||||
+++ xen-3.3.0-testing/Config.mk
|
||||
@@ -89,7 +89,7 @@ CONFIG_QEMU ?= ioemu
|
||||
@@ -84,20 +84,20 @@ QEMU_REMOTE=http://xenbits.xensource.com
|
||||
|
||||
# Specify which qemu-dm to use. This may be `ioemu' to use the old
|
||||
# Mercurial in-tree version, or a local directory, or a git URL.
|
||||
-# CONFIG_QEMU ?= ioemu
|
||||
+CONFIG_QEMU ?= ioemu-remote
|
||||
# CONFIG_QEMU ?= ../qemu-xen.git
|
||||
-ifeq ($(XEN_TARGET_ARCH),ia64)
|
||||
-CONFIG_QEMU ?= ioemu
|
||||
-else
|
||||
-CONFIG_QEMU ?= $(QEMU_REMOTE)
|
||||
-endif
|
||||
+# ifeq ($(XEN_TARGET_ARCH),ia64)
|
||||
+# CONFIG_QEMU ?= ioemu
|
||||
+# else
|
||||
+# CONFIG_QEMU ?= $(QEMU_REMOTE)
|
||||
+# endif
|
||||
|
||||
# Optional components
|
||||
XENSTAT_XENTOP ?= y
|
||||
VTPM_TOOLS ?= n
|
||||
@@ -11,3 +28,6 @@ Index: xen-3.3.0-testing/Config.mk
|
||||
PYTHON_TOOLS ?= y
|
||||
CONFIG_MINITERM ?= n
|
||||
CONFIG_LOMOUNT ?= n
|
||||
|
||||
--include $(XEN_ROOT)/.config
|
||||
+#-include $(XEN_ROOT)/.config
|
||||
|
Reference in New Issue
Block a user