| Message ID | 22158.34297.854903.908862@mariner.uk.xensource.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 2016-01-07 at 15:36 +0000, Ian Jackson wrote: > endif > -OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd > +OVMF_UPSTREAM_REVISION ?= af9785a9ed61daea52b47f0bf448f1f228beee1e This should be: OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d You've picked up 04c5efb0a141 but not f046e501bbc I think, we should take both, since that's what I've tested if nothing else. Ian. > QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0 > MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.0 > # Fri Jun 26 11:58:40 2015 +0100
diff --git a/Config.mk b/Config.mk index 5ba36aa..e829f7e 100644 --- a/Config.mk +++ b/Config.mk @@ -253,7 +253,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd +OVMF_UPSTREAM_REVISION ?= af9785a9ed61daea52b47f0bf448f1f228beee1e QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0 MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.0 # Fri Jun 26 11:58:40 2015 +0100
Ian Jackson writes ("Re: [Xen-devel] OVMF related osstest failures on multiple branches"): > Let's give it another day to see if anyone objects. I not, I will do > this tomorrow. I am just about to push this to staging-4.6 and will backport it to earlier branches as applicable. Ian. From 6c3c6ff9ecaa5ee0be8b535d36fdcd12380564a1 Mon Sep 17 00:00:00 2001 From: Wei Liu <wei.liu2@citrix.com> Date: Wed, 14 Oct 2015 12:41:13 +0100 Subject: [PATCH] Config.mk: update OVMF changeset Signed-off-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> (cherry picked from commit 04c5efb0a141fa53e805e396970419436e74ce67) Apropos of discussion in "OVMF related osstest failures on multiple branches" http://lists.xenproject.org/archives/html/xen-devel/2016-01/msg00442.html We believe the older ovmf.git does not work when built with the gcc in Debian jessie. We do not know where this bug lies but we are fixing it by updating ovmf. We have decided that we are not in a position to review the changes to OVMF upstream, and ourselves decide what to cherry pick. Instead we will update the revision wholesale and use the xen.git stable branches' push gate. Conflicts: Config.mk Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)