Re: [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it

[Keir Fraser <keir@xen.org>]

On 01/03/2012 16:02, "Attilio Rao" <attilio.rao@citrix.com> wrote:

> Signed-off-by: Attilio Rao <attilio.rao@citrix.com>

Acked-by: Keir Fraser <keir@xen.org>

I'll leave it to a tools person to apply it.

 -- Keir

> ---
> Difference with previous version:
> - With help by IanC and IanJ I've set up a new git mirror on xenbits
> - The OVMF install tries to clone directly from the mirror on xenbits
> - The OVMF install refers to a specific, tested revision, rather than
>   simply master
> 
> diff -r d7fe4cd831a0 -r eae03712b8ba Config.mk
> --- a/Config.mk Wed Feb 29 17:01:41 2012 +0000
> +++ b/Config.mk Thu Mar 01 16:01:32 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
>  CONFIG_ROMBIOS ?= y
>  CONFIG_SEABIOS ?= y
>  
> diff -r d7fe4cd831a0 -r eae03712b8ba tools/firmware/Makefile
> --- a/tools/firmware/Makefile Wed Feb 29 17:01:41 2012 +0000
> +++ b/tools/firmware/Makefile Thu Mar 01 16:01:32 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,21 @@ 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-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 eae03712b8ba tools/firmware/ovmf-makefile
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/tools/firmware/ovmf-makefile Thu Mar 01 16:01:32 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@lists.xen.org
> http://lists.xen.org/xen-devel