]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
scripts: setlocalversion: remove quotes around localversion from config
authorNikita Maslov <wkernelteam@gmail.com>
Thu, 13 Jan 2022 21:13:39 +0000 (00:13 +0300)
committerTom Rini <trini@konsulko.com>
Mon, 14 Feb 2022 18:04:39 +0000 (13:04 -0500)
After replacing of include/config/auto.conf sourcing with
extraction of CONFIG_LOCALVERSION, resulting version string
contains quotes around localversion part which are always
present in auto.conf (even if localversion is empty).

This patch fixes this script to remove quotes.

Signed-off-by: Nikita Maslov <wkernelteam@gmail.com>
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
scripts/setlocalversion

index c1c043526745bafbc48d72ff6d048f0ad9591adc..4a63143706705a574957b626baa8ff4d3a050260 100755 (executable)
@@ -153,8 +153,9 @@ if test -e include/config/auto.conf; then
        # We are interested only in CONFIG_LOCALVERSION and
        # CONFIG_LOCALVERSION_AUTO, so extract these in a safe
        # way (i.e. w/o sourcing auto.conf)
-       CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION=/ {print $2}'`
-       CONFIG_LOCALVERSION_AUTO=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}'`
+       # xargs echo removes quotes
+       CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION=/ {print $2}' | xargs echo`
+       CONFIG_LOCALVERSION_AUTO=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}' | xargs echo`
 else
        echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2
        exit 1