Skip to contentSkip to conversation

Config.mk: re-pin OVMF changeset and unpin qemu-xen

PATCH In review Anthony PERARD 3 participants 3 messages Jun 28, 2021 – Jul 2, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Config.mk: re-pin OVMF changeset and unpin qemu-xen

qemu-xen tree have a osstest gate and doesn't need to be pinned.

On the other hand, OVMF's xen repository doesn't have a gate and needs to be pinned. The "master" branch correspond now to the tag "edk2-stable202105", so pin to that commit.

Fixes a04509d34d72 ("Branching: Update version files etc. for newly unstable")
---
 Config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Config.mk +2 -2
index 9a174c77f383..f9dce4549b7c 100644
@@ -244,8 +244,8 @@ 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 ?= master
-QEMU_UPSTREAM_REVISION ?= 7ea428895af2840d85c524f0bd11a38aac308308
+OVMF_UPSTREAM_REVISION ?= e1999b264f1f9d7230edf2448f757c73da567832
+QEMU_UPSTREAM_REVISION ?= master
 MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
 
 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0
Signature · 1 line
Anthony PERARD
Acked-by on v1 1/1
#1 lore raw

Anthony PERARD writes ("[XEN PATCH] Config.mk: re-pin OVMF changeset and unpin qemu-xen"):

Quoted 8 lines

qemu-xen tree have a osstest gate and doesn't need to be pinned.

On the other hand, OVMF's xen repository doesn't have a gate and needs to be pinned. The "master" branch correspond now to the tag "edk2-stable202105", so pin to that commit.

Fixes a04509d34d72 ("Branching: Update version files etc. for newly unstable")

Looks like I adjusted the wrong line in a04509d34d72. Sorry.

Ian.

#2 lore raw

Hi,

Quoted 7 lines · Ian Jackson

Anthony PERARD writes ("[XEN PATCH] Config.mk: re-pin OVMF changeset and unpin qemu-xen"):

Quoted 6 lines

qemu-xen tree have a osstest gate and doesn't need to be pinned.

On the other hand, OVMF's xen repository doesn't have a gate and needs to be pinned. The "master" branch correspond now to the tag "edk2-stable202105", so pin to that commit.

Quoted 6 lines
Quoted 2 lines
Fixes a04509d34d72 ("Branching: Update version files etc. for newly unstable")

Looks like I adjusted the wrong line in a04509d34d72. Sorry.

I have committed it.

Cheers,

Signature · 1 line
Julien Grall