diff options
| author | Keir Fraser <keir@xen.org> | 2010-12-17 17:56:52 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-12-17 17:56:52 +0000 |
| commit | c25f41d047a35eb4d79136e218e3eff0804f2790 (patch) | |
| tree | faaf70016b58ea6bfef2c462bf4ca103c8b0cfe2 | |
| parent | 0979a8362a9a00900f6c3ff5031eb873de344295 (diff) | |
| download | xen-c25f41d047a35eb4d79136e218e3eff0804f2790.tar.gz xen-c25f41d047a35eb4d79136e218e3eff0804f2790.tar.bz2 xen-c25f41d047a35eb4d79136e218e3eff0804f2790.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>
xen-unstable changeset: 22381:2bedffabbcab
xen-unstable date: Tue Nov 09 18:15:25 2010 +0000
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tools/Makefile | 8 |
2 files changed, 12 insertions, 0 deletions
@@ -81,6 +81,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 44366f0327..ced7df9bc0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -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: |