| Message ID | 22158.34935.309421.54777@mariner.uk.xensource.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Ian Jackson writes ("Re: [Xen-devel] OVMF related osstest failures on multiple branches"):
> Oops. I had pushed only to 4.6, to which I have followed up with:
The change has now been made back to 4.3.
In 4.3, OVMF_UPSTREAM_REVISION was b0855f92 rather than cb9a7eba.
I have pulled in the additional changes, willy-nilly.
Ian.
diff --git a/Config.mk b/Config.mk index e829f7e..1eb53d7 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 ?= af9785a9ed61daea52b47f0bf448f1f228beee1e +OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d 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 Campbell writes ("Re: [Xen-devel] OVMF related osstest failures on multiple branches"): > 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. Oops. I had pushed only to 4.6, to which I have followed up with: From 1d3cc6e62c4d2fc3dd9251d4921881425c9d27bd Mon Sep 17 00:00:00 2001 From: Wei Liu <wei.liu2@citrix.com> Date: Thu, 12 Nov 2015 10:06:58 +0000 Subject: [PATCH] Config.mk: update OVMF changeset The new osstest tested head contains a fix for gcc-4.4 toolchain. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> (cherry picked from commit f046e501bbca1c8a46853b2e1f1b587e228c73de) This should have been folded into the previous commit. Conflicts: Config.mk Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)