xen/xen-config.diff

Index: xen-4.1.0-testing/Config.mk
===================================================================
--- xen-4.1.0-testing.orig/Config.mk
+++ xen-4.1.0-testing/Config.mk
@@ -183,7 +183,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 ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
-CONFIG_QEMU ?= $(QEMU_REMOTE)
+CONFIG_QEMU ?= ioemu-qemu-xen
 
 QEMU_TAG := xen-4.1.0
 #QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599
@@ -193,7 +193,7 @@ QEMU_TAG := xen-4.1.0
 # Optional components
 XENSTAT_XENTOP     ?= y
 VTPM_TOOLS         ?= n
-LIBXENAPI_BINDINGS ?= n
+LIBXENAPI_BINDINGS ?= y
 PYTHON_TOOLS       ?= y
 OCAML_TOOLS        ?= y
 CONFIG_MINITERM    ?= n
Index: xen-4.1.0-testing/tools/Makefile
===================================================================
--- xen-4.1.0-testing.orig/tools/Makefile
+++ xen-4.1.0-testing/tools/Makefile
@@ -79,14 +79,16 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TAR
 			 --interp-prefix=$(CROSS_SYS_ROOT)
 endif
 
-QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
-ifneq ($(QEMU_ROOT),.)
-export QEMU_ROOT
-endif
+#QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo ""; else echo .; fi)
+#ifneq ($(QEMU_ROOT),.)
+#export QEMU_ROOT
+#endif
 
 ioemu-dir-find:
 	set -ex; \
 	if test -d $(CONFIG_QEMU); then \
+		rm -f ioemu-dir; \
+		ln -sf $(CONFIG_QEMU) ioemu-dir; \
 		mkdir -p ioemu-dir; \
 	else \
 		if [ ! -d ioemu-remote ]; then \
@@ -108,7 +110,7 @@ ioemu-dir-find:
 		$(absolutify_xen_root); \
 		$(buildmakevars2shellvars); \
 		cd ioemu-dir; \
-		$(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS)
+		./xen-setup $(IOEMU_CONFIGURE_CROSS)
 
 .PHONY: ioemu-dir-force-update
 ioemu-dir-force-update:
Index: xen-4.1.0-testing/tools/libxc/Makefile
===================================================================
--- xen-4.1.0-testing.orig/tools/libxc/Makefile
+++ xen-4.1.0-testing/tools/libxc/Makefile
@@ -195,7 +195,7 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c
 
 libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l)
 
 xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
 	$(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl
Index: xen-4.1.0-testing/tools/firmware/etherboot/Makefile
===================================================================
--- xen-4.1.0-testing.orig/tools/firmware/etherboot/Makefile
+++ xen-4.1.0-testing/tools/firmware/etherboot/Makefile
@@ -35,11 +35,13 @@ eb-roms.h: Config
 	mv -f $@.new $@
 
 $T:
-	if ! wget -O _$T $(IPXE_TARBALL_URL); then \
-		$(GIT) clone $(IPXE_GIT_URL) $D.git; \
-		(cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
-		$(IPXE_GIT_TAG) | gzip >../_$T); \
-		rm -rf $D.git; \
+	if test -f /usr/bin/wget; then \
+		if ! wget -O _$T $(IPXE_TARBALL_URL); then \
+			$(GIT) clone $(IPXE_GIT_URL) $D.git; \
+			(cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
+			$(IPXE_GIT_TAG) | gzip >../_$T); \
+			rm -rf $D.git; \
+		fi \
 	fi
 	mv _$T $T