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

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1292608612 0
# Node ID f0186d496708d58764617063227c04102a9a0cfd
# Parent  938d1fc2935e3f3b73f6d2dc46bb4d78ca5fd3df
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>
xen-unstable changeset:   22381:2bedffabbcab
xen-unstable date:        Tue Nov 09 18:15:25 2010 +0000
---
 Makefile       |    4 ++++
 tools/Makefile |    8 ++++++++
 2 files changed, 12 insertions(+)

diff -r 938d1fc2935e -r f0186d496708 Makefile
--- a/Makefile  Fri Dec 17 17:56:00 2010 +0000
+++ b/Makefile  Fri Dec 17 17:56:52 2010 +0000
@@ -80,6 +80,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 938d1fc2935e -r f0186d496708 tools/Makefile
--- a/tools/Makefile    Fri Dec 17 17:56:00 2010 +0000
+++ b/tools/Makefile    Fri Dec 17 17:56:52 2010 +0000
@@ -107,6 +107,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