| Message ID | 20210628134217.47622-1-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [XEN] Config.mk: re-pin OVMF changeset and unpin qemu-xen | expand |
Anthony PERARD writes ("[XEN PATCH] 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")
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <iwj@xenproject.org>
Looks like I adjusted the wrong line in a04509d34d72. Sorry.
Ian.
Hi, On 28/06/2021 14:48, Ian Jackson wrote: > Anthony PERARD writes ("[XEN PATCH] 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") >> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > > Acked-by: Ian Jackson <iwj@xenproject.org> > > Looks like I adjusted the wrong line in a04509d34d72. Sorry. I have committed it. Cheers,
diff --git a/Config.mk b/Config.mk index 9a174c77f383..f9dce4549b7c 100644 --- a/Config.mk +++ b/Config.mk @@ -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
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") Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- Config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)