diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-14 14:18:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-14 14:18:45 -0500 |
| commit | 139e049732e2df1bc69eec9e8fdad274bb118bfb (patch) | |
| tree | fd158530bd396a17e187152e7326e49877ea01f7 /scripts/setlocalversion | |
| parent | 162c22bfbc4141f22937c6bc37aa02fd4621e76c (diff) | |
| parent | 9f0deae6d5fa656d604b3efa2371ea52def22173 (diff) | |
Merge branch '2022-02-14-assorted-fixes'
- Fix for pstore already being in the DT, "setlocalversion" script
bugfix and pdu001 platform bugfix
Diffstat (limited to 'scripts/setlocalversion')
| -rwxr-xr-x | scripts/setlocalversion | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index c1c04352674..4a631437067 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 |