[Xen-changelog] [xen-unstable] tools: provide explicit target for refetching/resetting qemu

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1289326525 0
# Node ID 2bedffabbcab85feca1984e9548029921c4a08e9
# Parent  a564339357047b729c4eb61a5a1e9a00f4e52b13
tools: provide explicit target for refetching/resetting qemu

This patch adds an explicit update mechanism:
  make tools/ioemu-dir-force-update
This isn't brilliant but is better than doing "cd tools/ioemu-remote
&& git reset --hard <sha1...>" by hand.

Note that invoking this target will destroy all working tree changes
made to qemu-xen.

Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Makefile       |    4 ++++
 tools/Makefile |    8 ++++++++
 2 files changed, 12 insertions(+)

diff -r a56433935704 -r 2bedffabbcab Makefile
--- a/Makefile  Tue Nov 09 18:03:55 2010 +0000
+++ b/Makefile  Tue Nov 09 18:15:25 2010 +0000
@@ -82,6 +82,10 @@ endif
 
 tools/ioemu-dir:
        $(MAKE) -C tools ioemu-dir-find
+
+.PHONY: tools/ioemu-dir-force-update
+tools/ioemu-dir-force-update:
+       $(MAKE) -C tools ioemu-dir-force-update
 
 .PHONY: install-docs
 install-docs:
diff -r a56433935704 -r 2bedffabbcab tools/Makefile
--- a/tools/Makefile    Tue Nov 09 18:03:55 2010 +0000
+++ b/tools/Makefile    Tue Nov 09 18:15:25 2010 +0000
@@ -117,6 +117,14 @@ ioemu-dir-find:
                cd ioemu-dir; \
                ./xen-setup $(IOEMU_CONFIGURE_CROSS)
 
+.PHONY: ioemu-dir-force-update
+ioemu-dir-force-update:
+       set -ex; \
+       if [ "$(QEMU_TAG)" ]; then \
+               cd ioemu-remote; \
+               $(GIT) reset --hard $(QEMU_TAG); \
+       fi
+
 subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
 
 subdir-clean-ioemu-dir:

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