Dear Kyle Moffett, In message <1324070080-16827-1-git-send-email-kyle.d.moff...@boeing.com> you wrote: > Several bugfixes have occurred upstream since this script was imported > into U-Boot. In particular, the script currently in U-Boot does not > describe commit f8bbb4dad0e9d91b7a51d6cc54dcf66d142f50fe correctly, > resulting in a version of "2011.09" instead of "2011.09-01460-gf8bbb4d". > > With that commit checked out, the command "git name-rev --tags HEAD" > gives this result: > HEAD tags/v2011.12-rc1~30^2 > > Then the "changes" regex does not match because of the trailing '^2': > grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > > The new version of tools/setlocalversion in the kernel correctly handles > those situations by using different plumbing commands. > > The version from the kernel is not directly usable as it does not append > the full GIT version that U-Boot expects unless the right config options > are set (CONFIG_LOCALVERSION_AUTO=y). Other than a few minor changes > for Kconfig, the imported version is very similar to Linux v3.2-rc4. > > Signed-off-by: Kyle Moffett <kyle.d.moff...@boeing.com> > Cc: Wolfgang Denk <w...@denx.de> > Cc: Mike Frysinger <vap...@gentoo.org> > > -- > Changelog: > v3: Fix "localversion-*" file support and minimize kernel delta. > --- > tools/setlocalversion | 185 > ++++++++++++++++++++++++++++++++++++++++++------- > 1 files changed, 161 insertions(+), 24 deletions(-)
Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de The C-shell doesn't parse. It adhoculates. - casper....@holland.sun.com in <3ol96k$b...@engnews2.eng.sun.com> _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot