diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-20 12:36:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-20 12:36:57 -0400 |
| commit | e2ab4ef83fe279e6f8e06ffa490144d082b95493 (patch) | |
| tree | 266ecef64d493c6b70fd7ef7cb8206c3cf907427 /scripts | |
| parent | 4fe34d61a3a9d9ed954cbc90713506a7598d6b36 (diff) | |
| parent | 700dea5a0bea9f64eba89fae7cb2540326fdfdc1 (diff) | |
| download | linux-e2ab4ef83fe279e6f8e06ffa490144d082b95493.tar.bz2 | |
Merge tag 'kbuild-fixes-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild fixes from Masahiro Yamada:
- fix a bashism of setlocalversion
- do not use the too new --sort option of tar
* tag 'kbuild-fixes-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kheaders: substituting --sort in archive creation
scripts: setlocalversion: fix a bashism
kbuild: update comment about KBUILD_ALLDIRS
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setlocalversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 220dae0db3f1..a2998b118ef9 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -93,7 +93,7 @@ scm_version() # Check for mercurial and a mercurial repo. if test -d .hg && hgid=`hg id 2>/dev/null`; then # Do we have an tagged version? If so, latesttagdistance == 1 - if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then + if [ "`hg log -r . --template '{latesttagdistance}'`" = "1" ]; then id=`hg log -r . --template '{latesttag}'` printf '%s%s' -hg "$id" else |