Merge tag 'v2024.04-rc4' into next

[thirdparty/u-boot.git] / scripts / dtc-version.sh

diff --git a/scripts/dtc-version.sh b/scripts/dtc-version.sh
index bfb514e179f3ec9f7508f7f311f164106d6632fa..18c59ac1e255a34a33829437e314741d43296f70 100755 (executable)
--- a/scripts/dtc-version.sh
+++ b/scripts/dtc-version.sh
@@ -15,12 +15,12 @@ if [ ${#dtc} -eq 0 ]; then
        exit 1
 fi
 
-if ! which $dtc >/dev/null ; then
+if ! which $dtc > /dev/null 2>&1 ; then
        echo "Error: Cannot find dtc: $dtc"
        exit 1
 fi
 
-MAJOR=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 1)
+MAJOR=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 1 | tr -d v)
 MINOR=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 2)
 PATCH=$($dtc -v | head -1 | awk '{print $NF}' | cut -d . -f 3 | cut -d - -f 1)