summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorKyle Moffett <Kyle.D.Moffett@boeing.com>2011-12-16 11:14:40 +0000
committerWolfgang Denk <wd@denx.de>2011-12-17 20:58:48 +0100
commita7b39185338c333a052728a7952b5f1cba4fc22a (patch)
tree7664c20d70cdf87f6ca70da4c65a36b66e6b3b9f /common
parent8b0affecb98f91142015ccf8c43653e1ad87c156 (diff)
downloadblackbird-obmc-uboot-a7b39185338c333a052728a7952b5f1cba4fc22a.tar.gz
blackbird-obmc-uboot-a7b39185338c333a052728a7952b5f1cba4fc22a.zip
tools/setlocalversion: Update from the Linux Kernel
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>
Diffstat (limited to 'common')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud