diff options
| author | Mark Brown <broonie@kernel.org> | 2021-09-20 15:56:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-21 15:23:35 +0100 |
| commit | ffb1e76f4f32d2b8ea4189df0484980370476395 (patch) | |
| tree | c62376eab558809973dc5b71806df07c388bfc1a /scripts/setlocalversion | |
| parent | 2bab94090b01bc593d8bc25f68df41f198721173 (diff) | |
| parent | e4e737bb5c170df6135a127739a9e6148ee3da82 (diff) | |
| download | linux-ffb1e76f4f32d2b8ea4189df0484980370476395.tar.gz linux-ffb1e76f4f32d2b8ea4189df0484980370476395.tar.bz2 linux-ffb1e76f4f32d2b8ea4189df0484980370476395.zip | |
Merge tag 'v5.15-rc2' into spi-5.15
Linux 5.15-rc2
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 151f04971faa..6b54e46a0f12 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -131,11 +131,14 @@ res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then # full scm version string res="$res$(scm_version)" -elif [ -z "${LOCALVERSION}" ]; then - # append a plus sign if the repository is not in a clean - # annotated or signed tagged state (as git describe only - # looks at signed or annotated tags - git tag -a/-s) and - # LOCALVERSION= is not specified +elif [ "${LOCALVERSION+set}" != "set" ]; then + # If the variable LOCALVERSION is not set, append a plus + # sign if the repository is not in a clean annotated or + # signed tagged state (as git describe only looks at signed + # or annotated tags - git tag -a/-s). + # + # If the variable LOCALVERSION is set (including being set + # to an empty string), we don't want to append a plus sign. scm=$(scm_version --short) res="$res${scm:++}" fi |