tools: clone ovmf to ovmf-dir directory

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>

diff --git a/Makefile b/Makefile
index d915660fac20fc7f9ffd1993c9c26fc11e65e005..4e48457d31682c70bbc8e52175b61ab8ff0f72d5 100644 (file)
--- 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 f0647655e2f91e3f8ed8d4928d287b55df0c2dc8..8633748df0b630a3e26f58349c60118a9acf3d6c 100644 (file)
--- 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 8ab1429cccbc193708ee51b1871c7a46d8d78ee2..e27e457d395007e15c9e95ea723dd7fc3031566a 100644 (file)
--- 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