[Xen-changelog] [xen-unstable] Clone and build upstream Qemu by default

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1327417770 0
# Node ID 277a1cde337f2d3777db18e2c76ec663c50f5dc6
# Parent  905ecf8d6482cc13e31e1c6a38c691e089ec335e
Clone and build upstream Qemu by default

From: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---


diff -r 905ecf8d6482 -r 277a1cde337f .hgignore
--- a/.hgignore Tue Jan 24 15:09:30 2012 +0000
+++ b/.hgignore Tue Jan 24 15:09:30 2012 +0000
@@ -298,6 +298,8 @@
 ^tools/xm-test/tests/.*\.test$
 ^tools/qemu-xen-traditional-dir-remote
 ^tools/qemu-xen-traditional-dir$
+^tools/qemu-xen-dir-remote
+^tools/qemu-xen-dir$
 ^tools/ocaml/.*/.*\.annot$
 ^tools/ocaml/.*/.*\.cmx?a$
 ^tools/ocaml/.*/META$
diff -r 905ecf8d6482 -r 277a1cde337f Config.mk
--- a/Config.mk Tue Jan 24 15:09:30 2012 +0000
+++ b/Config.mk Tue Jan 24 15:09:30 2012 +0000
@@ -207,6 +207,13 @@
 QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git
 endif
 
+ifeq ($(GIT_HTTP),y)
+QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git
+else
+QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
+endif
+QEMU_UPSTREAM_REVISION ?= master
+
 # 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
diff -r 905ecf8d6482 -r 277a1cde337f Makefile
--- a/Makefile  Tue Jan 24 15:09:30 2012 +0000
+++ b/Makefile  Tue Jan 24 15:09:30 2012 +0000
@@ -70,7 +70,7 @@
        $(MAKE) -C tools install
 
 ifeq ($(CONFIG_IOEMU),y)
-install-tools: tools/qemu-xen-traditional-dir
+install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir
 endif
 
 .PHONY: install-kernels
@@ -91,6 +91,13 @@
 tools/qemu-xen-traditional-dir-force-update:
        $(MAKE) -C tools qemu-xen-traditional-dir-force-update
 
+tools/qemu-xen-dir:
+       $(MAKE) -C tools qemu-xen-dir-find
+
+.PHONY: tools/qemu-xen-dir-force-update
+tools/qemu-xen-dir-force-update:
+       $(MAKE) -C tools qemu-xen-dir-force-update
+
 .PHONY: install-docs
 install-docs:
        sh ./docs/check_pkgs && $(MAKE) -C docs install || true
diff -r 905ecf8d6482 -r 277a1cde337f tools/Makefile
--- a/tools/Makefile    Tue Jan 24 15:09:30 2012 +0000
+++ b/tools/Makefile    Tue Jan 24 15:09:30 2012 +0000
@@ -36,6 +36,7 @@
 # do not recurse in to a dir we are about to delete
 ifneq "$(MAKECMDGOALS)" "distclean"
 SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
+SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
 endif
 
 SUBDIRS-y += xenpmd
@@ -76,6 +77,7 @@
 .PHONY: distclean
 distclean: subdirs-distclean
        rm -rf qemu-xen-traditional-dir qemu-xen-traditional-dir-remote
+       rm -rf qemu-xen-dir qemu-xen-dir-remote
 
 ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
@@ -97,6 +99,14 @@
                $(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) 
qemu-xen-traditional-dir; \
        fi
 
+qemu-xen-dir-find:
+       if test -d $(QEMU_UPSTREAM_URL) ; then \
+               mkdir -p qemu-xen-dir; \
+       else \
+               export GIT=$(GIT); \
+               $(XEN_ROOT)/scripts/git-checkout.sh $(QEMU_UPSTREAM_URL) 
$(QEMU_UPSTREAM_REVISION) qemu-xen-dir ; \
+       fi
+
 .PHONY: qemu-xen-traditional-dir-force-update
 qemu-xen-traditional-dir-force-update:
        set -ex; \
@@ -119,6 +129,40 @@
                $(MAKE) -C qemu-xen-traditional-dir clean; \
        fi
 
+.PHONY: qemu-xen-dir-force-update
+qemu-xen-dir-force-update:
+       set -ex; \
+       if [ "$(QEMU_UPSTREAM_REVISION)" ]; then \
+               cd qemu-xen-dir-remote; \
+               $(GIT) fetch origin; \
+               $(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \
+       fi
+
+subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
+       if test -d $(QEMU_UPSTREAM_URL) ; then \
+               source=$(QEMU_UPSTREAM_URL); \
+       else \
+               source=.; \
+       fi; \
+       cd qemu-xen-dir; \
+       $$source/configure --enable-xen --target-list=i386-softmmu \
+               --source-path=$$source \
+               --extra-cflags="-I$(XEN_ROOT)/tools/include \
+               -I$(XEN_ROOT)/tools/libxc \
+               -I$(XEN_ROOT)/tools/xenstore" \
+               --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \
+               -L$(XEN_ROOT)/tools/xenstore" \
+               --bindir=$(LIBEXEC) \
+               --disable-kvm \
+               $(IOEMU_CONFIGURE_CROSS); \
+       $(MAKE) install
+
+subdir-clean-qemu-xen-dir:
+       set -e; if test -d qemu-xen-dir/.; then \
+               $(buildmakevars2shellvars); \
+               $(MAKE) -C qemu-xen-dir clean; \
+       fi
+
 subdir-clean-debugger/gdbsx subdir-distclean-debugger/gdbsx: .phony
        $(MAKE) -C debugger/gdbsx clean
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog