diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2010-11-09 18:15:25 +0000 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2010-11-09 18:15:25 +0000 |
commit | cb6c757fa4e9b79e32adac8d1648e6faed6923d7 (patch) | |
tree | 216c7e6119c897b51f2ad969fdb46fb91477b2e4 | |
parent | 8fe49db6bda46327bc04bace2cf6a88402d8929e (diff) | |
download | xen-cb6c757fa4e9b79e32adac8d1648e6faed6923d7.tar.gz xen-cb6c757fa4e9b79e32adac8d1648e6faed6923d7.tar.bz2 xen-cb6c757fa4e9b79e32adac8d1648e6faed6923d7.zip |
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@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | tools/Makefile | 8 |
2 files changed, 12 insertions, 0 deletions
@@ -83,6 +83,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: sh ./docs/check_pkgs && $(MAKE) -C docs install || true diff --git a/tools/Makefile b/tools/Makefile index ed70b93a84..b5ca635409 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -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: |