From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [PATCH V3 3/5] tools: clone ovmf to ovmf-dir directory
Date: Tue, 29 Oct 2013 11:39:49 +0000 [thread overview]
Message-ID: <1383046791-1256-4-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1383046791-1256-1-git-send-email-wei.liu2@citrix.com>
From: Ian Campbell <ian.campbell@citrix.com>
for consistency with other foo-dir e.g. qemu, seabios.
Remove obsolete ovmf-find target.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Makefile | 4 ++++
tools/firmware/Makefile | 29 ++++++++++-------------------
tools/firmware/hvmloader/Makefile | 2 +-
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile
index d915660..4e48457 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,10 @@ endif
tools/firmware/seabios-dir-force-update:
$(MAKE) -C tools/firmware seabios-dir-force-update
+.PHONY: tools/firmware/ovmf-dir-force-update
+tools/firmware/ovmf-dir-force-update:
+ $(MAKE) -C tools/firmware ovmf-dir-force-update
+
.PHONY: install-docs
install-docs:
$(MAKE) -C docs install
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index f064765..8633748 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -6,7 +6,7 @@ TARGET := hvmloader/hvmloader
INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
SUBDIRS-y :=
-SUBDIRS-$(CONFIG_OVMF) += ovmf
+SUBDIRS-$(CONFIG_OVMF) += ovmf-dir
ifeq ($(SEABIOS_PATH),)
SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
endif
@@ -15,9 +15,9 @@ SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
SUBDIRS-y += hvmloader
-ovmf:
- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf
- cp ovmf-makefile ovmf/Makefile;
+ovmf-dir:
+ GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir
+ cp ovmf-makefile ovmf-dir/Makefile;
seabios-dir:
GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
@@ -52,32 +52,23 @@ subdir-distclean-etherboot: .phony
$(MAKE) -C etherboot distclean
subdir-distclean-ovmf: .phony
- rm -rf ovmf ovmf-remote
+ rm -rf ovmf-dir ovmf-dir-remote
subdir-distclean-seabios-dir: .phony
rm -rf seabios-dir seabios-dir-remote
-.PHONY: ovmf-find
-ovmf-find:
- if test -d $(OVMF_UPSTREAM_URL) ; then \
- mkdir -p ovmf; \
- else \
- export GIT=$(GIT); \
- $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf ; \
- fi
-
-.PHONY: ovmf-force-update
-ovmf-force-update:
+.PHONY: ovmf-dir-force-update
+ovmf-dir-force-update:
set -ex; \
if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \
- cd ovmf-remote; \
+ cd ovmf-dir-remote; \
$(GIT) fetch origin; \
$(GIT) reset --hard $(OVMF_UPSTREAM_REVISION); \
fi
subdir-clean-ovmf:
- set -e; if test -d ovmf/.; then \
- $(MAKE) -C ovmf clean; \
+ set -e; if test -d ovmf-dir/.; then \
+ $(MAKE) -C ovmf-dir clean; \
fi
.PHONY: seabios-dir-force-update
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 8ab1429..e27e457 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -37,7 +37,7 @@ endif
CIRRUSVGA_DEBUG ?= n
-OVMF_DIR := ../ovmf
+OVMF_DIR := ../ovmf-dir
ROMBIOS_DIR := ../rombios
SEABIOS_DIR := ../seabios-dir
--
1.7.10.4
next prev parent reply other threads:[~2013-10-29 11:39 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 11:39 [PATCH V3 0/5] Reintroduce OVMF support Wei Liu
2013-10-29 11:39 ` [PATCH V3 1/5] libxl: bump LIBXL_MAXMEM_CONSTANT to 2048 Wei Liu
2013-11-01 11:14 ` George Dunlap
2013-11-01 16:02 ` Ian Campbell
2013-11-01 16:10 ` Wei Liu
2013-11-01 16:23 ` Ian Campbell
2013-11-06 10:32 ` Wei Liu
2013-11-06 10:41 ` Ian Campbell
2013-11-06 18:04 ` Stefano Stabellini
2013-11-07 11:03 ` Ian Campbell
2013-11-07 11:15 ` Processed: " xen
2013-11-06 12:04 ` Wei Liu
2013-10-29 11:39 ` [PATCH V3 2/5] Config.mk: update OVMF changeset Wei Liu
2013-10-29 14:16 ` Fabio Fantoni
2013-10-29 14:21 ` Wei Liu
2013-10-29 16:15 ` Fabio Fantoni
2013-10-29 16:34 ` Wei Liu
2013-10-30 11:33 ` Fabio Fantoni
2013-10-30 11:50 ` Wei Liu
2013-10-30 12:57 ` Fabio Fantoni
2013-10-30 14:05 ` Wei Liu
2013-10-30 15:52 ` Fabio Fantoni
2013-10-30 15:58 ` Wei Liu
2013-10-31 9:47 ` Fabio Fantoni
2013-10-31 10:03 ` Wei Liu
2013-10-31 11:22 ` Fabio Fantoni
2013-10-31 14:40 ` Wei Liu
2013-10-31 15:41 ` Fabio Fantoni
2013-10-30 12:09 ` Wei Liu
2013-10-30 12:42 ` Fabio Fantoni
2013-11-01 16:05 ` Ian Campbell
2013-10-29 11:39 ` Wei Liu [this message]
2013-10-29 11:39 ` [PATCH V3 4/5] tools: support system supplied ovmf binary Wei Liu
2013-10-29 11:39 ` [PATCH V3 5/5] tools: Enable OVMF build by default Wei Liu
2013-11-11 14:09 ` [PATCH V3 0/5] Reintroduce OVMF support Ian Campbell
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=1383046791-1256-4-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/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).