Moving SPL_LDSCRIPT to Kconfig triggered an unfortunate attempt of
command substitution, as the sourced auto.conf may include $(ARCH)
which tries to execute a command 'ARCH'.
This showed up as a warning similar to the following:
  include/config/auto.conf: line 209: ARCH: command not found

This change does no longer attempt to source auto.conf, but rather
passes it through awk to retrieve the values for CONFIG_LOCALVERSION
and CONFIG_LOCALVERSION_AUTO.  This will also mitigate the risk of
unintended command substitution.

Signed-off-by: Philipp Tomsich <philipp.toms...@theobroma-systems.com>
Reported-by: Andy Yan <andy....@rock-chips.com>

---

 scripts/setlocalversion | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 63d91e2..8564bed 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -141,7 +141,11 @@ if $scm_only; then
 fi
 
 if test -e include/config/auto.conf; then
-       . include/config/auto.conf
+       # 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}'`
 else
        echo "Error: kernelrelease not valid - run 'make prepare' to update it"
        exit 1
-- 
2.1.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to