[PATCH v2] scripts: setlocalversion: remove quotes around localversion from config

Nikita Maslov wkernelteam at gmail.com
Tue Feb 8 10:42:28 CET 2022


From: Nikita Maslov <wkernelteam at gmail.com>
Date: Fri, 14 Jan 2022 00:13:39 +0300
Subject: [PATCH v2] scripts: setlocalversion: remove quotes around localversion from config

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 at gmail.com>
Cc: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
Cc: Tom Rini <trini at konsulko.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
Changes for v2:
    - re-post because of messed up word wrapping


  scripts/setlocalversion | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index c1c0435267..4a63143706 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -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
-- 


More information about the U-Boot mailing list