scripts: setlocalversion: remove quotes around localversion from config
PATCH 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] 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 so it removes quotes now.
---
scripts/setlocalversion | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/setlocalversion +3 -2
@@ -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
--
Quoted 13 lines · Nikita Maslov
From: Nikita Maslov <[email protected]>
Date: Fri, 14 Jan 2022 00:13:39 +0300
Subject: [PATCH] scripts: setlocalversion: remove quotes around localversion from configAfter replacing of
include/config/auto.confsourcing with extraction ofCONFIG_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 so it removes quotes now.
Quoted 7 lines
Signed-off-by Nikita Maslov <[email protected]>Cc Philipp Tomsich <[email protected]>Cc Tom Rini <[email protected]>---
scripts/setlocalversion | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 42 lines · Nikita Maslov
From: Nikita Maslov <[email protected]>
Date: Fri, 14 Jan 2022 00:13:39 +0300
Subject: [PATCH] scripts: setlocalversion: remove quotes around localversion from configAfter replacing of
include/config/auto.confsourcing with extraction ofCONFIG_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 so it removes quotes now.
Signed-off-by Nikita Maslov <[email protected]>Cc Philipp Tomsich <[email protected]>Cc Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>---
scripts/setlocalversion | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)'=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}' | xargs echo`
else
echo "Error: kernelrelease not valid - run 'make prepare' to
update it" >&2
exit 1
--scripts/setlocalversion +0
-1@@ -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=`catinclude/config/auto.conf| awk -F
'=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}'`scripts/setlocalversion +2
-0+ # xargs echo removes quotes + CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '='
Quoted 2 lines
'/^CONFIG_LOCALVERSION=/ {print $2}' | xargs echo`
+CONFIG_LOCALVERSION_AUTO=`catinclude/config/auto.conf| awk -F
Can you please re-post this? The whitespace was rather badly destroyed, thanks.
Signature · 1 line
Tom