Patchwork Use a tag for SeaBIOS stable checkouts.

Use a tag (rel-0.6.1.3) for SeaBIOS stable checkouts instead of the
stable branch.  The tag is a little safer because it prevents an
incorrect commit to the stable branch from being immiediately picked
up by coreboot users.

Note - rel-0.6.1.3 (and 0.6.1-stable) now have the CFLAGS build fix
that was causing build failures for coreboot users.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 payloads/external/SeaBIOS/Makefile.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Kevin O'Connor wrote:
> Use a tag (rel-0.6.1.3) for SeaBIOS stable checkouts instead of the
> stable branch.  The tag is a little safer because it prevents an
> incorrect commit to the stable branch from being immiediately picked
> up by coreboot users.
> 
> Note - rel-0.6.1.3 (and 0.6.1-stable) now have the CFLAGS build fix
> that was causing build failures for coreboot users.
> 
> Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

Acked-by: Peter Stuge <peter@stuge.se>

Do you think we should also default to the stable tag rather than
master?


//Peter

Peter Stuge wrote:
> > Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
> 
> Acked-by: Peter Stuge <peter@stuge.se>

r6292

On Sun, Jan 23, 2011 at 07:43:59AM +0100, Peter Stuge wrote:
> Kevin O'Connor wrote:
> > Use a tag (rel-0.6.1.3) for SeaBIOS stable checkouts instead of the
> > stable branch.  The tag is a little safer because it prevents an
> > incorrect commit to the stable branch from being immiediately picked
> > up by coreboot users.
> > 
> > Note - rel-0.6.1.3 (and 0.6.1-stable) now have the CFLAGS build fix
> > that was causing build failures for coreboot users.
> > 
> > Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
> 
> Acked-by: Peter Stuge <peter@stuge.se>
> 
> Do you think we should also default to the stable tag rather than
> master?

It looks like it already defaults to the stable branch.

-Kevin

* Kevin O'Connor <kevin@koconnor.net> [110122 17:28]:
> Use a tag (rel-0.6.1.3) for SeaBIOS stable checkouts instead of the
> stable branch.  The tag is a little safer because it prevents an
> incorrect commit to the stable branch from being immiediately picked
> up by coreboot users.
> 
> Note - rel-0.6.1.3 (and 0.6.1-stable) now have the CFLAGS build fix
> that was causing build failures for coreboot users.
> 
> Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
> ---
>  payloads/external/SeaBIOS/Makefile.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
> index 120e796..faca57e 100644
> --- a/payloads/external/SeaBIOS/Makefile.inc
> +++ b/payloads/external/SeaBIOS/Makefile.inc
> @@ -1,7 +1,7 @@
>  
>  
>  TAG-$(CONFIG_SEABIOS_MASTER)=master
> -TAG-$(CONFIG_SEABIOS_STABLE)=0.6.1-stable
> +TAG-$(CONFIG_SEABIOS_STABLE)=rel-0.6.1.3
>  
>  all: seabios
>  
> -- 
> 1.7.3.4

On the build system with git 1.7.3.4 this breaks the build because
0.6.1-stable is a head and rel-0.6.1.3 is a master. Starting with the
second target git dies with:

Checking out SeaBIOS rel-0.6.1.3
test -d coreboot-builds/sharedutils/seabios && ( cd
coreboot-builds/sharedutils/seabios; pwd; git pull ) || \
        git clone git://git.linuxtogo.org/home/kevin/seabios.git
coreboot-builds/sharedutils/seabios
/srv/svn/coreboot-extra/tmp/coreboot-6292/payloads/external/SeaBIOS/coreboot-builds/sharedutils/seabios
You are not currently on a branch, so I cannot use any
'branch.<branchname>.merge' in your configuration file.
Please specify which remote branch you want to use on the command
line and try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
fatal: destination path 'coreboot-builds/sharedutils/seabios' already
exists and is not an empty directory.
make[2]: *** [checkout] Error 128
make[1]: *** [seabios] Error 2
make[1]: Leaving directory `/srv/svn/coreboot-extra/tmp/coreboot-6292'
make: *** [all] Error 2

Not sure what the right fix is for this. I neither want to check the
changes I make to the config file in to the local repository nor do I
want to undo/redo the changes for every build, nor do I want to
re-checkout for every target. Is this possible with git?

Stefan

* Kevin O'Connor <kevin@koconnor.net> [110123 17:12]:
> On Sun, Jan 23, 2011 at 07:43:59AM +0100, Peter Stuge wrote:
> > Kevin O'Connor wrote:
> > > Use a tag (rel-0.6.1.3) for SeaBIOS stable checkouts instead of the
> > > stable branch.  The tag is a little safer because it prevents an
> > > incorrect commit to the stable branch from being immiediately picked
> > > up by coreboot users.
> > > 
> > > Note - rel-0.6.1.3 (and 0.6.1-stable) now have the CFLAGS build fix
> > > that was causing build failures for coreboot users.
> > > 
> > > Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
> > 
> > Acked-by: Peter Stuge <peter@stuge.se>
> > 
> > Do you think we should also default to the stable tag rather than
> > master?
> 
> It looks like it already defaults to the stable branch.
 
Yes, that is what we do. You can choose to go for master in Kconfig
though.