Skip to contentSkip to conversation

scripts: setlocalversion: remove quotes around localversion from config

PATCH In review Nikita Maslov 2 participants 2 messages Feb 8, 2022 – Feb 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 scripts: setlocalversion: remove quotes around localversion from config

From: Nikita Maslov <[email protected]>
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.

---
Changes for v2:
- re-post because of messed up word wrapping

 scripts/setlocalversion | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/setlocalversion +3 -2
index c1c0435267..4a63143706 100755
@@ -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
#1 lore raw
Quoted 9 lines · Nikita Maslov

From: Nikita Maslov <[email protected]>
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).

Quoted 6 lines

This patch fixes this script to remove quotes.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom