* [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it
@ 2012-03-01 16:02 Attilio Rao
2012-03-01 16:44 ` Keir Fraser
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Attilio Rao @ 2012-03-01 16:02 UTC (permalink / raw)
To: xen-devel; +Cc: ian.campbell
Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
---
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/*
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it
2012-03-01 16:02 [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it Attilio Rao
@ 2012-03-01 16:44 ` Keir Fraser
2012-03-01 17:32 ` Ian Jackson
2012-03-01 17:37 ` Ian Jackson
2 siblings, 0 replies; 6+ messages in thread
From: Keir Fraser @ 2012-03-01 16:44 UTC (permalink / raw)
To: Attilio Rao, xen-devel; +Cc: ian.campbell
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it
2012-03-01 16:02 [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it Attilio Rao
2012-03-01 16:44 ` Keir Fraser
@ 2012-03-01 17:32 ` Ian Jackson
2012-03-01 17:49 ` Attilio Rao
2012-03-01 17:37 ` Ian Jackson
2 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2012-03-01 17:32 UTC (permalink / raw)
To: Attilio Rao; +Cc: xen-devel, ian.campbell
Attilio Rao writes ("[Xen-devel] [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it"):
> Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
I build-tested this, and:
install -m0644 -p /u/iwj/work/xen-unstable-tools.hg/xen/xen-syms /u/iwj/work/xen-unstable-tools.hg/dist/install/boot/xen-syms-4.2-unstable
if [ -r /u/iwj/work/xen-unstable-tools.hg/xen/xen.efi ]; then \
[ -d /u/iwj/work/xen-unstable-tools.hg/dist/install/usr/lib/efi ] || install -d -m0755 -p /u/iwj/work/xen-unstable-tools.hg/dist/install/usr/lib/efi; \
install -m0644 -p /u/iwj/work/xen-unstable-tools.hg/xen/xen.efi /u/iwj/work/xen-unstable-tools.hg/dist/install/usr/lib/efi/xen-4.2-unstable.efi; \
ln -sf xen-4.2-unstable.efi /u/iwj/work/xen-unstable-tools.hg/dist/install/usr/lib/efi/xen-4.2.efi; \
ln -sf xen-4.2-unstable.efi /u/iwj/work/xen-unstable-tools.hg/dist/install/usr/lib/efi/xen-4.efi; \
ln -sf xen-4.2-unstable.efi /u/iwj/work/xen-unstable-tools.hg/dist/install/usr/lib/efi/xen.efi; \
if [ -n '/boot/efi' -a -n '' ]; then \
install -m0644 -p /u/iwj/work/xen-unstable-tools.hg/xen/xen.efi /u/iwj/work/xen-unstable-tools.hg/dist/install/boot/efi/efi//xen-4.2-unstable.efi; \
elif [ "/u/iwj/work/xen-unstable-tools.hg/dist/install" = "dist/install" ]; then \
echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
fi; \
fi
make[2]: Leaving directory `/u/iwj/work/xen-unstable-tools.hg/xen'
make[1]: Leaving directory `/u/iwj/work/xen-unstable-tools.hg/xen'
Switched to a new branch 'dummy'
cp seabios-config seabios-dir/.config;
Switched to a new branch 'dummy'
cp ovmf-makefile ovmf/Makefile;
cp: cannot stat `ovmf-makefile': No such file or directory
make[3]: *** [ovmf] Error 1
make[3]: Leaving directory `/u/iwj/work/xen-unstable-tools.hg/tools/firmware'
make[2]: *** [subdir-install-firmware] Error 2
make[2]: Leaving directory `/u/iwj/work/xen-unstable-tools.hg/tools'
make[1]: *** [subdirs-install] Error 2
make[1]: Leaving directory `/u/iwj/work/xen-unstable-tools.hg/tools'
make: *** [install-tools] Error 2
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it
2012-03-01 17:32 ` Ian Jackson
@ 2012-03-01 17:49 ` Attilio Rao
0 siblings, 0 replies; 6+ messages in thread
From: Attilio Rao @ 2012-03-01 17:49 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel@lists.xensource.com, Ian Campbell
On 01/03/12 17:32, Ian Jackson wrote:
> Attilio Rao writes ("[Xen-devel] [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it"):
>
>> Signed-off-by: Attilio Rao<attilio.rao@citrix.com>
>>
> I build-tested this, and:
>
I'm sorry, did the patch applied correctly?
ovmf-makefile is a newly added file and I can see it in the patch.
Thanks,
Attilio
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it
2012-03-01 16:02 [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it Attilio Rao
2012-03-01 16:44 ` Keir Fraser
2012-03-01 17:32 ` Ian Jackson
@ 2012-03-01 17:37 ` Ian Jackson
2012-03-01 17:57 ` Attilio Rao
2 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2012-03-01 17:37 UTC (permalink / raw)
To: Attilio Rao; +Cc: xen-devel, ian.campbell
Attilio Rao writes ("[Xen-devel] [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it"):
> Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
Also we're missing relevant .hgignore (and .gitignore if you feel like
it) entries.
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it
2012-03-01 17:37 ` Ian Jackson
@ 2012-03-01 17:57 ` Attilio Rao
0 siblings, 0 replies; 6+ messages in thread
From: Attilio Rao @ 2012-03-01 17:57 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel@lists.xensource.com, Ian Campbell
On 01/03/12 17:37, Ian Jackson wrote:
> Attilio Rao writes ("[Xen-devel] [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it"):
>
>> Signed-off-by: Attilio Rao<attilio.rao@citrix.com>
>>
> Also we're missing relevant .hgignore (and .gitignore if you feel like
> it) entries.
>
>
Isn't that true also for SeaBios, BTW?
Attilio
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-01 17:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-01 16:02 [PATCH] [PATCH v2] Fetch the OVMF repository from specific git mirror and enable it Attilio Rao
2012-03-01 16:44 ` Keir Fraser
2012-03-01 17:32 ` Ian Jackson
2012-03-01 17:49 ` Attilio Rao
2012-03-01 17:37 ` Ian Jackson
2012-03-01 17:57 ` Attilio Rao
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).