From: <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
keir@xen.org, Ian.Campbell@citrix.com,
Stefano.Stabellini@eu.citrix.com
Subject: [PATCH v3 2/4] Rename ioemu-dir as qemu-xen-traditional-dir
Date: Fri, 9 Sep 2011 12:17:47 +0100 [thread overview]
Message-ID: <1315567069-28775-2-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1109091150200.12963@kaball-desktop>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
diff -r f27aff6f2cfe .hgignore
--- a/.hgignore Fri Sep 09 10:34:25 2011 +0000
+++ b/.hgignore Fri Sep 09 10:35:08 2011 +0000
@@ -291,8 +291,8 @@
^tools/xm-test/lib/XmTestLib/config.py$
^tools/xm-test/lib/XmTestReport/xmtest.py$
^tools/xm-test/tests/.*\.test$
-^tools/ioemu-dir-remote
-^tools/ioemu-dir$
+^tools/qemu-xen-traditional-dir-remote
+^tools/qemu-xen-traditional-dir$
^tools/ocaml/.*/.*\.annot$
^tools/ocaml/.*/.*\.cmx?a$
^tools/ocaml/.*/META$
diff -r f27aff6f2cfe Makefile
--- a/Makefile Fri Sep 09 10:34:25 2011 +0000
+++ b/Makefile Fri Sep 09 10:35:08 2011 +0000
@@ -70,7 +70,7 @@ install-tools:
$(MAKE) -C tools install
ifeq ($(CONFIG_IOEMU),y)
-install-tools: tools/ioemu-dir
+install-tools: tools/qemu-xen-traditional-dir
endif
.PHONY: install-kernels
@@ -78,18 +78,18 @@ install-kernels:
for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done
.PHONY: install-stubdom
-install-stubdom: tools/ioemu-dir install-tools
+install-stubdom: tools/qemu-xen-traditional-dir install-tools
$(MAKE) -C stubdom install
ifeq (x86_64,$(XEN_TARGET_ARCH))
XEN_TARGET_ARCH=x86_32 $(MAKE) -C stubdom install-grub
endif
-tools/ioemu-dir:
- $(MAKE) -C tools ioemu-dir-find
+tools/qemu-xen-traditional-dir:
+ $(MAKE) -C tools qemu-xen-traditional-dir-find
-.PHONY: tools/ioemu-dir-force-update
-tools/ioemu-dir-force-update:
- $(MAKE) -C tools ioemu-dir-force-update
+.PHONY: tools/qemu-xen-traditional-dir-force-update
+tools/qemu-xen-traditional-dir-force-update:
+ $(MAKE) -C tools qemu-xen-traditional-dir-force-update
.PHONY: install-docs
install-docs:
diff -r f27aff6f2cfe tools/Makefile
--- a/tools/Makefile Fri Sep 09 10:34:25 2011 +0000
+++ b/tools/Makefile Fri Sep 09 10:35:08 2011 +0000
@@ -30,7 +30,7 @@ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
# do not recurse in to a dir we are about to delete
ifneq "$(MAKECMDGOALS)" "distclean"
-SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
+SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
endif
SUBDIRS-y += xenpmd
@@ -70,7 +70,7 @@ clean: subdirs-clean
.PHONY: distclean
distclean: subdirs-distclean
- rm -rf ioemu-dir ioemu-dir-remote
+ rm -rf qemu-xen-traditional-dir qemu-xen-traditional-dir-remote
ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
@@ -78,24 +78,24 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TAR
--interp-prefix=$(CROSS_SYS_ROOT)
endif
-ioemu-dir-find:
- $(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) ioemu-dir
+qemu-xen-traditional-dir-find:
+ $(XEN_ROOT)/scripts/git-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) qemu-xen-traditional-dir
-.PHONY: ioemu-dir-force-update
-ioemu-dir-force-update:
+.PHONY: qemu-xen-traditional-dir-force-update
+qemu-xen-traditional-dir-force-update:
set -ex; \
if [ "$(QEMU_TAG)" ]; then \
- cd ioemu-dir-remote; \
+ cd qemu-xen-traditional-dir-remote; \
$(GIT) fetch origin; \
$(GIT) reset --hard $(QEMU_TAG); \
fi
-subdir-all-ioemu-dir subdir-install-ioemu-dir: ioemu-dir-find
+subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
-subdir-clean-ioemu-dir:
- set -e; if test -d ioemu-dir/.; then \
+subdir-clean-qemu-xen-traditional-dir:
+ set -e; if test -d qemu-xen-traditional-dir/.; then \
$(buildmakevars2shellvars); \
- $(MAKE) -C ioemu-dir clean; \
+ $(MAKE) -C qemu-xen-traditional-dir clean; \
fi
subdir-clean-debugger/gdbsx subdir-distclean-debugger/gdbsx: .phony
next prev parent reply other threads:[~2011-09-09 11:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 11:16 [PATCH v3] build upstream qemu and seabios by default Stefano Stabellini
2011-09-09 11:17 ` [PATCH v3 1/4] Move the ioemu-dir-find shell script to an external file stefano.stabellini
2011-09-13 10:00 ` Christoph Egger
2011-09-13 10:19 ` Stefano Stabellini
2011-09-09 11:17 ` stefano.stabellini [this message]
2011-09-09 11:17 ` [PATCH v3 2/4] Clone and build upstream Qemu by default stefano.stabellini
2011-09-09 11:17 ` [PATCH v3 2/4] Clone and build Seabios " stefano.stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315567069-28775-2-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).