2011-02-04 21:19:54 +00:00
|
|
|
Index: xen-4.0.2-testing/Config.mk
|
2007-02-11 10:48:10 +00:00
|
|
|
===================================================================
|
2011-02-04 21:19:54 +00:00
|
|
|
--- xen-4.0.2-testing.orig/Config.mk
|
|
|
|
+++ xen-4.0.2-testing/Config.mk
|
|
|
|
@@ -165,7 +165,7 @@ endif
|
|
|
|
# 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 ?= ../qemu-xen.git
|
|
|
|
-CONFIG_QEMU ?= $(QEMU_REMOTE)
|
|
|
|
+CONFIG_QEMU ?= ioemu-qemu-xen
|
|
|
|
|
2011-02-14 21:35:06 +00:00
|
|
|
QEMU_TAG := xen-4.0.2-rc2
|
2011-02-04 21:19:54 +00:00
|
|
|
#QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a
|
|
|
|
@@ -181,9 +181,9 @@ CONFIG_OCAML_XENSTORED ?= n
|
2007-02-11 10:48:10 +00:00
|
|
|
# Optional components
|
2007-04-25 23:53:07 +00:00
|
|
|
XENSTAT_XENTOP ?= y
|
|
|
|
VTPM_TOOLS ?= n
|
2007-02-11 10:48:10 +00:00
|
|
|
-LIBXENAPI_BINDINGS ?= n
|
|
|
|
+LIBXENAPI_BINDINGS ?= y
|
2007-04-25 23:53:07 +00:00
|
|
|
PYTHON_TOOLS ?= y
|
2008-07-18 23:04:37 +00:00
|
|
|
CONFIG_MINITERM ?= n
|
|
|
|
CONFIG_LOMOUNT ?= n
|
2008-08-17 22:24:29 +00:00
|
|
|
|
|
|
|
--include $(XEN_ROOT)/.config
|
|
|
|
+#-include $(XEN_ROOT)/.config
|
2011-02-04 21:19:54 +00:00
|
|
|
Index: xen-4.0.2-testing/tools/libxc/Makefile
|
2010-01-16 00:12:54 +00:00
|
|
|
===================================================================
|
2011-02-04 21:19:54 +00:00
|
|
|
--- xen-4.0.2-testing.orig/tools/libxc/Makefile
|
|
|
|
+++ xen-4.0.2-testing/tools/libxc/Makefile
|
2011-02-14 21:35:06 +00:00
|
|
|
@@ -174,7 +174,8 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c
|
2010-01-16 00:12:54 +00:00
|
|
|
|
2011-02-14 21:35:06 +00:00
|
|
|
libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
|
2010-01-16 00:12:54 +00:00
|
|
|
libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
|
2011-02-14 21:35:06 +00:00
|
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
|
|
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l)
|
|
|
|
+
|
|
|
|
|
|
|
|
-include $(DEPS)
|
2010-01-16 00:12:54 +00:00
|
|
|
|