Re: [Xen-devel] [PATCH] Config.mk: Update SEABIOS_UPSTREAM_TAG to rel-1.9.1

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote:
> On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote:
> > Switch from tracking a commit post 1.9.0 to the 1.9.1 release.
> > 
> 
> Thanks for this patch.
> 
> We can't apply this patch just yet. We need to wait a bit until the
> change to upstream trickles down to our own tree [0] -- OSSTest will
> work on that shortly. See [1] for an example output.

Our osstest branch only tests seabios.git#master whereas this is tracking
the 1.9.x stable branch.

I don't think we really want/need the overhead of testing multiple branches
of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on
the stable branch have passed our master branch commit gate (even if that
means they did so in the context of other un-backported patches). I haven't
checked but given the timings andÂhttp://logs.test-lab.xenproject.org/osste
st/results/all-branch-statuses.txtÂindicating our seabios branch is up to
date I expect this is the case.

There is some risk to this, but SeaBIOS gets a fairly small number of
changes so the stable branches do not stray too far from master in general
so I think this approach is fine.

IOW it would be fine to push upstreams 1.9-stable to our repo along with
the rel-1.9.1 tag and to then apply this patch.


> 
> Wei.
> 
> [0] git://xenbits.xen.org/osstest/seabios.git
> [1] <osstest-80975-mainreport@xxxxxxx>
> 
> > Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
> > ---
> > 
> > Please make sure to sync git://xenbits.xen.org/seabios.git to
> > upstream prior to pushing this to staging.
> > 
> > ---
> > ÂConfig.mk | 6 +++---
> > Â1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/Config.mk b/Config.mk
> > index 429e460..79eb2bd 100644
> > --- a/Config.mk
> > +++ b/Config.mk
> > @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?=
> > 89268f00b0b0215057cb74edd94e866536a02489
> > Â# Fri Jan 15 13:24:03 2016 +0000
> > Â# mini-os: Include libxenforeignmemory with libxc
> > Â
> > -SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab
> > -# Mon Dec 28 13:50:41 2015 +0100
> > -# build: fix typo in buildversion.py
> > +SEABIOS_UPSTREAM_REVISION ?= rel-1.9.1
> > +# Fri Jan 15 15:49:32 2016 +0000
> > +# biostables: Support SMBIOS 2.6+ UUID format
> > Â
> > ÂETHERBOOT_NICS ?= rtl8139 8086100e
> > Â

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel