On Tue, Jan 25, 2011 at 02:37:03AM +0100, Stefan Reinauer wrote: > * Peter Stuge <[email protected]> [110124 00:35]: > > > +TAG-$(CONFIG_SEABIOS_MASTER)=origin/master > > > TAG-$(CONFIG_SEABIOS_STABLE)=rel-0.6.1.3 > > .. > > > checkout: > > > echo "Checking out SeaBIOS $(TAG-y)" > > > - test -d seabios && ( cd seabios; git pull ) || \ > > > + test -d seabios && ( cd seabios; git fetch ) || \ > > > > I agree that git fetch should be here, certainly not git pull. > > A fetch alone does not seem to make much sense. It will not update the > tree when working with the master tag, as far as I can tell. The idea of > master is that you will always get the latest and greatest SeaBIOS, so > the tree should be updated accordingly, eh, fetched and merged.
The fetch should be okay, because the patch also changes the tag from "master" to "origin/master". The real fix is to move SeaBIOS to Kconfig. It's okay if you wish to backout my previous patch. I apologize for not catching the build failure on subsequent builds. -Kevin -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
