diff mbox

Config.mk: Update SEABIOS_UPSTREAM_TAG to 442502

Message ID 1452789850.32341.14.camel@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Campbell Jan. 14, 2016, 4:44 p.m. UTC 
On Thu, 2016-01-14 at 14:44 +0000, Ian Campbell wrote:
> On Thu, 2016-01-14 at 06:00 -0700, Jan Beulich wrote:
> > > > > On 14.01.16 at 12:32, <roger.pau@citrix.com> wrote:
> > > --- a/Config.mk
> > > +++ b/Config.mk
> > > @@ -255,9 +255,10 @@ MINIOS_UPSTREAM_REVISION ?=
> > > d25773c8afa2f4dbbb466116daeb60159ddd22bd
> > >  # Thu Dec 3 11:23:25 2015 +0000
> > >  # mini-os: Include libxentoollog with libxc
> > >  
> > > -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
> > > -# Tue Nov 17 09:18:44 2015 -0500
> > > -# docs: Note v1.9.0 release
> > > +SEABIOS_UPSTREAM_REVISION ?=
> > > 44250252eeaefd5e81bae2f73639bd323682217b
> > > +# Thu Jan 7 12:02:51 2016 -0500
> > > +# tpm: Do not set TPM in failure mode if menu command fails
> > > +# NB: we should try to update to a rel-* version before releasing
> > > Xen.
> > 
> > Assuming they cut a 1.9.1 by then including that fix, won't we risk
> > moving backwards in that case? Wouldn't it be better in such a
> > situation to follow the ipxe model and apply patches on top of the
> > most recent release?
> 
> Good point.
> 
> I shall drop seabios-devel a line re 1.9.1 or 1.10.0 and see what's what.

In response to my line there is now 1.9-stable branch in seabios.git, which
contains just the patch of interest. I propose we update to that branch, as
below (+ appropriate pushes to our seabios.git tree to make the branch
appear there).

Ian.

commit a661f70a8aad3fe7b2c828632714785a04b1d96b
Author: Ian Campbell <ian.campbell@citrix.com>
Date:   Thu Jan 14 16:43:42 2016 +0000

    SEABIOS_UPSTREAM_REVISION Update
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Comments

Roger Pau Monné Jan. 14, 2016, 4:56 p.m. UTC | #1 
El 14/01/16 a les 17.44, Ian Campbell ha escrit:
> On Thu, 2016-01-14 at 14:44 +0000, Ian Campbell wrote:
>> On Thu, 2016-01-14 at 06:00 -0700, Jan Beulich wrote:
>>>>>> On 14.01.16 at 12:32, <roger.pau@citrix.com> wrote:
>>>> --- a/Config.mk
>>>> +++ b/Config.mk
>>>> @@ -255,9 +255,10 @@ MINIOS_UPSTREAM_REVISION ?=
>>>> d25773c8afa2f4dbbb466116daeb60159ddd22bd
>>>>  # Thu Dec 3 11:23:25 2015 +0000
>>>>  # mini-os: Include libxentoollog with libxc
>>>>  
>>>> -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
>>>> -# Tue Nov 17 09:18:44 2015 -0500
>>>> -# docs: Note v1.9.0 release
>>>> +SEABIOS_UPSTREAM_REVISION ?=
>>>> 44250252eeaefd5e81bae2f73639bd323682217b
>>>> +# Thu Jan 7 12:02:51 2016 -0500
>>>> +# tpm: Do not set TPM in failure mode if menu command fails
>>>> +# NB: we should try to update to a rel-* version before releasing
>>>> Xen.
>>>
>>> Assuming they cut a 1.9.1 by then including that fix, won't we risk
>>> moving backwards in that case? Wouldn't it be better in such a
>>> situation to follow the ipxe model and apply patches on top of the
>>> most recent release?
>>
>> Good point.
>>
>> I shall drop seabios-devel a line re 1.9.1 or 1.10.0 and see what's what.
> 
> In response to my line there is now 1.9-stable branch in seabios.git, which
> contains just the patch of interest. I propose we update to that branch, as
> below (+ appropriate pushes to our seabios.git tree to make the branch
> appear there).

That sounds fine, I'm wondering however if OSSTest tests those SeaBIOS
stable branches at all, and if we have a push gate for them also?

> 
> commit a661f70a8aad3fe7b2c828632714785a04b1d96b
> Author: Ian Campbell <ian.campbell@citrix.com>
> Date:   Thu Jan 14 16:43:42 2016 +0000
> 
>     SEABIOS_UPSTREAM_REVISION Update
>     
>     Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Acked-by: Roger Pau Monné <roger.pau@citrix.com>

> diff --git a/Config.mk b/Config.mk
> index 62f8209..d654af8 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd
>  # Thu Dec 3 11:23:25 2015 +0000
>  # mini-os: Include libxentoollog with libxc
>  
> -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
> -# Tue Nov 17 09:18:44 2015 -0500
> -# docs: Note v1.9.0 release
> +SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab
> +# Mon Dec 28 13:50:41 2015 +0100
> +# build: fix typo in buildversion.py
>  
>  ETHERBOOT_NICS ?= rtl8139 8086100e
>  
>
Roger Pau Monné Jan. 14, 2016, 4:57 p.m. UTC | #2 
El 14/01/16 a les 17.44, Ian Campbell ha escrit:
> On Thu, 2016-01-14 at 14:44 +0000, Ian Campbell wrote:
>> On Thu, 2016-01-14 at 06:00 -0700, Jan Beulich wrote:
>>>>>> On 14.01.16 at 12:32, <roger.pau@citrix.com> wrote:
>>>> --- a/Config.mk
>>>> +++ b/Config.mk
>>>> @@ -255,9 +255,10 @@ MINIOS_UPSTREAM_REVISION ?=
>>>> d25773c8afa2f4dbbb466116daeb60159ddd22bd
>>>>  # Thu Dec 3 11:23:25 2015 +0000
>>>>  # mini-os: Include libxentoollog with libxc
>>>>  
>>>> -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
>>>> -# Tue Nov 17 09:18:44 2015 -0500
>>>> -# docs: Note v1.9.0 release
>>>> +SEABIOS_UPSTREAM_REVISION ?=
>>>> 44250252eeaefd5e81bae2f73639bd323682217b
>>>> +# Thu Jan 7 12:02:51 2016 -0500
>>>> +# tpm: Do not set TPM in failure mode if menu command fails
>>>> +# NB: we should try to update to a rel-* version before releasing
>>>> Xen.
>>>
>>> Assuming they cut a 1.9.1 by then including that fix, won't we risk
>>> moving backwards in that case? Wouldn't it be better in such a
>>> situation to follow the ipxe model and apply patches on top of the
>>> most recent release?
>>
>> Good point.
>>
>> I shall drop seabios-devel a line re 1.9.1 or 1.10.0 and see what's what.
> 
> In response to my line there is now 1.9-stable branch in seabios.git, which
> contains just the patch of interest. I propose we update to that branch, as
> below (+ appropriate pushes to our seabios.git tree to make the branch
> appear there).

That sounds fine, I'm wondering however if OSSTest tests those SeaBIOS
stable branches at all, and if we have a push gate for them also?

> 
> commit a661f70a8aad3fe7b2c828632714785a04b1d96b
> Author: Ian Campbell <ian.campbell@citrix.com>
> Date:   Thu Jan 14 16:43:42 2016 +0000
> 
>     SEABIOS_UPSTREAM_REVISION Update
>     
>     Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Acked-by: Roger Pau Monné <roger.pau@citrix.com>

> diff --git a/Config.mk b/Config.mk
> index 62f8209..d654af8 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd
>  # Thu Dec 3 11:23:25 2015 +0000
>  # mini-os: Include libxentoollog with libxc
>  
> -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
> -# Tue Nov 17 09:18:44 2015 -0500
> -# docs: Note v1.9.0 release
> +SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab
> +# Mon Dec 28 13:50:41 2015 +0100
> +# build: fix typo in buildversion.py
>  
>  ETHERBOOT_NICS ?= rtl8139 8086100e
>  
>
Jan Beulich Jan. 14, 2016, 4:57 p.m. UTC | #3 
>>> On 14.01.16 at 17:44, <ian.campbell@citrix.com> wrote:
> On Thu, 2016-01-14 at 14:44 +0000, Ian Campbell wrote:
>> On Thu, 2016-01-14 at 06:00 -0700, Jan Beulich wrote:
>> > > > > On 14.01.16 at 12:32, <roger.pau@citrix.com> wrote:
>> > > --- a/Config.mk
>> > > +++ b/Config.mk
>> > > @@ -255,9 +255,10 @@ MINIOS_UPSTREAM_REVISION ?=
>> > > d25773c8afa2f4dbbb466116daeb60159ddd22bd
>> > >  # Thu Dec 3 11:23:25 2015 +0000
>> > >  # mini-os: Include libxentoollog with libxc
>> > >  
>> > > -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
>> > > -# Tue Nov 17 09:18:44 2015 -0500
>> > > -# docs: Note v1.9.0 release
>> > > +SEABIOS_UPSTREAM_REVISION ?=
>> > > 44250252eeaefd5e81bae2f73639bd323682217b
>> > > +# Thu Jan 7 12:02:51 2016 -0500
>> > > +# tpm: Do not set TPM in failure mode if menu command fails
>> > > +# NB: we should try to update to a rel-* version before releasing
>> > > Xen.
>> > 
>> > Assuming they cut a 1.9.1 by then including that fix, won't we risk
>> > moving backwards in that case? Wouldn't it be better in such a
>> > situation to follow the ipxe model and apply patches on top of the
>> > most recent release?
>> 
>> Good point.
>> 
>> I shall drop seabios-devel a line re 1.9.1 or 1.10.0 and see what's what.
> 
> In response to my line there is now 1.9-stable branch in seabios.git, which
> contains just the patch of interest. I propose we update to that branch, as
> below (+ appropriate pushes to our seabios.git tree to make the branch
> appear there).

Fine with me, thanks.

Jan
Ian Campbell Jan. 14, 2016, 5:01 p.m. UTC | #4 
On Thu, 2016-01-14 at 17:56 +0100, Roger Pau Monné wrote:
> El 14/01/16 a les 17.44, Ian Campbell ha escrit:
> > On Thu, 2016-01-14 at 14:44 +0000, Ian Campbell wrote:
> > > On Thu, 2016-01-14 at 06:00 -0700, Jan Beulich wrote:
> > > > > > > On 14.01.16 at 12:32, <roger.pau@citrix.com> wrote:
> > > > > --- a/Config.mk
> > > > > +++ b/Config.mk
> > > > > @@ -255,9 +255,10 @@ MINIOS_UPSTREAM_REVISION ?=
> > > > > d25773c8afa2f4dbbb466116daeb60159ddd22bd
> > > > >  # Thu Dec 3 11:23:25 2015 +0000
> > > > >  # mini-os: Include libxentoollog with libxc
> > > > >  
> > > > > -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
> > > > > -# Tue Nov 17 09:18:44 2015 -0500
> > > > > -# docs: Note v1.9.0 release
> > > > > +SEABIOS_UPSTREAM_REVISION ?=
> > > > > 44250252eeaefd5e81bae2f73639bd323682217b
> > > > > +# Thu Jan 7 12:02:51 2016 -0500
> > > > > +# tpm: Do not set TPM in failure mode if menu command fails
> > > > > +# NB: we should try to update to a rel-* version before
> > > > > releasing
> > > > > Xen.
> > > > 
> > > > Assuming they cut a 1.9.1 by then including that fix, won't we risk
> > > > moving backwards in that case? Wouldn't it be better in such a
> > > > situation to follow the ipxe model and apply patches on top of the
> > > > most recent release?
> > > 
> > > Good point.
> > > 
> > > I shall drop seabios-devel a line re 1.9.1 or 1.10.0 and see what's
> > > what.
> > 
> > In response to my line there is now 1.9-stable branch in seabios.git,
> > which
> > contains just the patch of interest. I propose we update to that
> > branch, as
> > below (+ appropriate pushes to our seabios.git tree to make the branch
> > appear there).
> 
> That sounds fine, I'm wondering however if OSSTest tests those SeaBIOS
> stable branches at all, and if we have a push gate for them also?

It doesn't, we only test seabios.git#master.

However only things tested via master go into the stable branches and in
general they are very quiet (i.e. low numbers of backports over the
lifetime of a given stable branch, e.g. there were 12 backports to 1.8-
stable since the 1.8.0 release in February 2015) and conservative.

I'm content to rely on the xen-unstable branch's testing of this change
after it goes in.

> 
> > 
> > commit a661f70a8aad3fe7b2c828632714785a04b1d96b
> > Author: Ian Campbell <ian.campbell@citrix.com>
> > Date:   Thu Jan 14 16:43:42 2016 +0000
> > 
> >     SEABIOS_UPSTREAM_REVISION Update
> >     
> >     Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Acked-by: Roger Pau Monné <roger.pau@citrix.com>

Thanks.

Ian.

> 
> > diff --git a/Config.mk b/Config.mk
> > index 62f8209..d654af8 100644
> > --- a/Config.mk
> > +++ b/Config.mk
> > @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?=
> > d25773c8afa2f4dbbb466116daeb60159ddd22bd
> >  # Thu Dec 3 11:23:25 2015 +0000
> >  # mini-os: Include libxentoollog with libxc
> >  
> > -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
> > -# Tue Nov 17 09:18:44 2015 -0500
> > -# docs: Note v1.9.0 release
> > +SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab
> > +# Mon Dec 28 13:50:41 2015 +0100
> > +# build: fix typo in buildversion.py
> >  
> >  ETHERBOOT_NICS ?= rtl8139 8086100e
> >  
> > 
>
Ian Campbell Jan. 15, 2016, 10:56 a.m. UTC | #5 
On Thu, 2016-01-14 at 17:56 +0100, Roger Pau Monné wrote:
> 
> > commit a661f70a8aad3fe7b2c828632714785a04b1d96b
> > Author: Ian Campbell <ian.campbell@citrix.com>
> > Date:   Thu Jan 14 16:43:42 2016 +0000
> > 
> >     SEABIOS_UPSTREAM_REVISION Update
> >     
> >     Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Acked-by: Roger Pau Monné <roger.pau@citrix.com>

Applied.

> 
> > diff --git a/Config.mk b/Config.mk
> > index 62f8209..d654af8 100644
> > --- a/Config.mk
> > +++ b/Config.mk
> > @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?=
> > d25773c8afa2f4dbbb466116daeb60159ddd22bd
> >  # Thu Dec 3 11:23:25 2015 +0000
> >  # mini-os: Include libxentoollog with libxc
> >  
> > -SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
> > -# Tue Nov 17 09:18:44 2015 -0500
> > -# docs: Note v1.9.0 release
> > +SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab
> > +# Mon Dec 28 13:50:41 2015 +0100
> > +# build: fix typo in buildversion.py
> >  
> >  ETHERBOOT_NICS ?= rtl8139 8086100e
> >  
> > 
>
diff mbox

Patch

diff --git a/Config.mk b/Config.mk
index 62f8209..d654af8 100644
--- a/Config.mk
+++ b/Config.mk
@@ -255,9 +255,9 @@  MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd
 # Thu Dec 3 11:23:25 2015 +0000
 # mini-os: Include libxentoollog with libxc
 
-SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0
-# Tue Nov 17 09:18:44 2015 -0500
-# docs: Note v1.9.0 release
+SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab
+# Mon Dec 28 13:50:41 2015 +0100
+# build: fix typo in buildversion.py
 
 ETHERBOOT_NICS ?= rtl8139 8086100e