Re: [Xen-devel] [PATCH] [PATCH v3] Fetch the OVMF repository from specific git mirror and enable it

[Roger Pau Monnà <roger.pau@xxxxxxxxxxxxx>]

2012/3/1 Attilio Rao <attilio.rao@xxxxxxxxxx>:
> Signed-off-by: Attilio Rao <attilio.rao@xxxxxxxxxx>
>
> ---
>
> Differences with previous version:
> - Add ovmf entries to .hgignore
> - Add a rule in tools/firmware/Makefile for ovmf-find in order to cope with
> Âalready cloned git repositories
>
> diff -r d7fe4cd831a0 -r 402a1e16b2d8 .hgignore
> --- a/.hgignore Wed Feb 29 17:01:41 2012 +0000
> +++ b/.hgignore Thu Mar 01 19:27:17 2012 +0000
> @@ -287,6 +287,8 @@
> Â^tools/xm-test/lib/XmTestLib/config.py$
> Â^tools/xm-test/lib/XmTestReport/xmtest.py$
> Â^tools/xm-test/tests/.*\.test$
> +^tools/firmware/ovmf-remote
> +^tools/firmware/ovmf$
> Â^tools/qemu-xen-traditional-dir-remote
> Â^tools/qemu-xen-traditional-dir$
> Â^tools/qemu-xen-dir-remote
> diff -r d7fe4cd831a0 -r 402a1e16b2d8 Config.mk
> --- a/Config.mk Wed Feb 29 17:01:41 2012 +0000
> +++ b/Config.mk Thu Mar 01 19:27:17 2012 +0000
> @@ -187,12 +187,15 @@ QEMU_REMOTE=git://xenbits.xensource.com/
> Âendif
>
> Âifeq ($(GIT_HTTP),y)
> +OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git
> ÂQEMU_UPSTREAM_URL ?= 
> http://xenbits.xen.org/git-http/qemu-upstream-unstable.git
> ÂSEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git
> Âelse
> +OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git
> ÂQEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git
> ÂSEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
> Âendif
> +OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871
> ÂQEMU_UPSTREAM_REVISION ?= master
> ÂSEABIOS_UPSTREAM_TAG ?= c69e288adfe6c273df4b1f3d9c223d8a4fb613cd
> Â# Wed Feb 8 20:23:36 2012 -0500
> @@ -200,7 +203,7 @@ SEABIOS_UPSTREAM_TAG ?= c69e288adfe6c273
>
> ÂETHERBOOT_NICS ?= rtl8139 8086100e
>
> -CONFIG_OVMF ?= n
> +CONFIG_OVMF ?= y

Since this is in the tools directory (and I think it's a tools only
thing), shouldn't this option be set by the configure script instead
of hardcoding it in Config.mk?

> ÂCONFIG_ROMBIOS ?= y
> ÂCONFIG_SEABIOS ?= y
>
> diff -r d7fe4cd831a0 -r 402a1e16b2d8 tools/firmware/Makefile
> --- a/tools/firmware/Makefile  Wed Feb 29 17:01:41 2012 +0000
> +++ b/tools/firmware/Makefile  Thu Mar 01 19:27:17 2012 +0000
> @@ -6,12 +6,17 @@ TARGET Â Â Â:= hvmloader/hvmloader
> ÂINST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
>
> ÂSUBDIRS-y :=
> +SUBDIRS-$(CONFIG_OVMF) += ovmf
> ÂSUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
> ÂSUBDIRS-$(CONFIG_ROMBIOS) += rombios
> Â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;
> +
> Âseabios-dir:
> Â Â Â ÂGIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) 
> $(SEABIOS_UPSTREAM_TAG) seabios-dir
> Â Â Â Âcp seabios-config seabios-dir/.config;
> @@ -44,9 +49,30 @@ distclean: subdirs-distclean
> Âsubdir-distclean-etherboot: .phony
> Â Â Â Â$(MAKE) -C etherboot distclean
>
> +subdir-distclean-ovmf: .phony
> + Â Â Â rm -rf ovmf ovmf-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:
> + Â Â Â set -ex; \
> + Â Â Â if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \
> + Â Â Â Â Â Â Â cd ovmf-remote; \
> + Â Â Â Â Â Â Â $(GIT) fetch origin; \
> + Â Â Â Â Â Â Â $(GIT) reset --hard $(OVMF_UPSTREAM_REVISION); \
> + Â Â Â fi
> +
> Â.PHONY: seabios-dir-force-update
> Âseabios-dir-force-update:
> Â Â Â Âset -ex; \
> diff -r d7fe4cd831a0 -r 402a1e16b2d8 tools/firmware/ovmf-makefile
> --- /dev/null  Thu Jan 01 00:00:00 1970 +0000
> +++ b/tools/firmware/ovmf-makefile   ÂThu Mar 01 19:27:17 2012 +0000
> @@ -0,0 +1,17 @@
> +# OVMF building system is not ready yet to run in parallel.
> +# Force it to be serial in order to exploit parallelism for neighbors.
> +
> +.NOTPARALLEL:
> +MAKEFLAGS Â+= -j1
> +
> +.PHONY: all
> +all: ovmf.bin
> +
> +.PHONY: ovmf.bin
> +ovmf.bin:
> + Â Â Â OvmfPkg/build.sh -a X64
> + Â Â Â cp Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd ovmf.bin
> +
> +.PHONY: clean
> +clean:
> + Â Â Â rm -rf ovmf.bin Build/*
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel