summaryrefslogtreecommitdiff
path: root/tools/setlocalversion
AgeCommit message (Collapse)Author
2011-12-17tools/setlocalversion: Update from the Linux KernelKyle Moffett
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.Moffett@boeing.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Mike Frysinger <vapier@gentoo.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
2010-09-21setlocalversion: add some more fallbacks for git describeMike Frysinger
If working out of a custom git tree that lacks annotated tags, the 'git describe' operation spews "fatal: cannot describe" errors all over the place. So add some fallback code in case the best naming was unable to locate something useful. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2009-04-04tools/setlocalversion: use git svn instead of git-svnPeter Korsgaard
Use the new "git <subcmd>" syntax instead of the deprecated "git-<subcmd>". Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2008-04-18Add support for u-boot in svn and localversion-* filesMike Frysinger
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2008-03-14tools/setlocalversion: use a git-describe-ish formatWolfgang Denk
Change the automatic local version to have the form -nnnnn-gSHA1SUMID, where 'nnnnn' is the number of commits since the last tag (i.e., 1.3.2-rc3). This makes it much easier to recognize "newer" versions and to see how much has been changed since the referenced tag. Stolen from Linux kernel's scripts/setlocalversio, see commit d882421f. Signed-off-by: Wolfgang Denk <wd@denx.de>
2006-02-21Add GIT version information (commid ID) to untagged U-Boot versionsWolfgang Denk
As done in the linux kernel, the U-Boot version (U_BOOT_VERSION) of all unreleased (untagged) U-Boot images will be automatically extended upon compiletime with a part of the GIT commit ID and possibly with "dirty" if uncommited changes are detected. Here an example for the resulting version: "U-Boot 1.1.4-g3457ac18-dirty" The version is now maintained in the toplevel Makefile and the version headers are autogenerated. Patch by Stefan Roese, 9 Feb 2006