diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2023-02-05 21:09:56 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2023-02-05 21:18:23 +0900 |
| commit | eed36d77517786e4b3a9f17c6a66c6df2fc99442 (patch) | |
| tree | b9d1294226b03f46778af690bbd35e551f856ee4 /scripts/setlocalversion | |
| parent | 534066a983df0935847061c844eb178f8a53a9e7 (diff) | |
setlocalversion: clean up the construction of version output
Concatenate all components in the last line instead of accumulating
them into the 'res' variable.
No functional change is intended. A preparation for the next change.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index ad72ea2c8228..7e2c83f5c50d 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -108,19 +108,18 @@ if [ -z "${KERNELVERSION}" ]; then fi # localversion* files in the build and source directory -res="$(collect_files localversion*)" +file_localversion="$(collect_files localversion*)" if test ! "$srctree" -ef .; then - res="$res$(collect_files "$srctree"/localversion*)" + file_localversion="${file_localversion}$(collect_files "$srctree"/localversion*)" fi -# CONFIG_LOCALVERSION and LOCALVERSION (if set) +# version string from CONFIG_LOCALVERSION config_localversion=$(sed -n 's/^CONFIG_LOCALVERSION=\(.*\)$/\1/p' include/config/auto.conf) -res="${res}${config_localversion}${LOCALVERSION}" # scm version string if not at a tagged commit if grep -q "^CONFIG_LOCALVERSION_AUTO=y$" include/config/auto.conf; then # full scm version string - res="$res$(scm_version)" + scm_version="$(scm_version)" 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 @@ -129,7 +128,7 @@ elif [ "${LOCALVERSION+set}" != "set" ]; then # # If the variable LOCALVERSION is set (including being set # to an empty string), we don't want to append a plus sign. - res="$res$(scm_version --short)" + scm_version="$(scm_version --short)" fi -echo "${KERNELVERSION}${res}" +echo "${KERNELVERSION}${file_localversion}${config_localversion}${LOCALVERSION}${scm_version}" |