From ae05efd98917223a0e669026baceb7f489755a42 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 14 Oct 2015 12:41:13 +0100 Subject: [PATCH] Config.mk: update OVMF changeset Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commits 04c5efb0a141fa53e805e396970419436e74ce67 and f046e501bbca1c8a46853b2e1f1b587e228c73de) 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 (cherry picked from commits 6c3c6ff9ecaa5ee0be8b535d36fdcd12380564a1 and 1d3cc6e62c4d2fc3dd9251d4921881425c9d27bd) Conflicts: Config.mk Signed-off-by: Ian Jackson (cherry picked from commit ee576d71103e6795dc0add91db1b0d281eab1caf) Conflicts: Config.mk Signed-off-by: Ian Jackson (cherry picked from commit 6d2c41d676339ecc6255b92876b6153d4f85f579) In 4.3, old OVMF_UPSTREAM_REVISION was b0855f92 rather than cb9a7eba. I have pulled in the additional changes, willy-nilly. Conflicts: Config.mk Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index 8a8c7a6369..cbe4878ce5 100644 --- a/Config.mk +++ b/Config.mk @@ -211,7 +211,7 @@ OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif -OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 +OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.4 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100