diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 15:33:50 -0400 |
| commit | dca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4 (patch) | |
| tree | a3689b801070c1360b120b7280c6adc4de5f692a /scripts/setlocalversion | |
| parent | 71856843fb1d8ee455a4c1a60696c74afa4809e5 (diff) | |
| parent | 31d9adca82ce65e5c99d045b5fd917c702b6fce3 (diff) | |
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index bd6dca8a0ab2..84b88f109b80 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion | |||
| @@ -108,7 +108,7 @@ scm_version() | |||
| 108 | fi | 108 | fi |
| 109 | 109 | ||
| 110 | # Check for svn and a svn repo. | 110 | # Check for svn and a svn repo. |
| 111 | if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then | 111 | if rev=`LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then |
| 112 | rev=`echo $rev | awk '{print $NF}'` | 112 | rev=`echo $rev | awk '{print $NF}'` |
| 113 | printf -- '-svn%s' "$rev" | 113 | printf -- '-svn%s' "$rev" |
| 114 | 114 | ||