From a3d7b7f876bca3443ca7a8e93d6f1405dfeb211a Mon Sep 17 00:00:00 2001
From: Naresh A <nareshk@ti.com>
Date: Thu, 6 Jul 2023 16:58:51 +0530
Subject: [PATCH] am64x/am243x/am263x : remove version value from mcu plus sdk
 install directory

Remove version value from mcu plus sdk install directory

Fixes: PINDSW-5641

Signed-off-by: Naresh A <nareshk@ti.com>
---
 releases/09_00_00/am243x/download_components.sh |  2 +-
 releases/09_00_00/am263x/download_components.sh |  2 +-
 releases/09_00_00/am64x/download_components.sh  |  2 +-
 scripts/common.sh                               | 10 ++++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/releases/09_00_00/am243x/download_components.sh b/releases/09_00_00/am243x/download_components.sh
index 49519d9..928de50 100644
--- a/releases/09_00_00/am243x/download_components.sh
+++ b/releases/09_00_00/am243x/download_components.sh
@@ -76,7 +76,7 @@ else
     #install_clang   ${CGT_TI_ARM_CLANG_VERSION} ${clang_url_folder} ${clang_install_folder} ${clang_install_file} ${install_dir}
     install_gcc_arm ${GCC_ARM_VERSION} ${gcc_arm_install_folder} ${gcc_arm_download_file} ${install_dir} ${GCC_ARM_VERSION_FOLDER}
     install_syscfg  ${SYSCFG_VERSION} ${install_dir}
-    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${install_dir}
+    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder}
     if [ "$skip_nodejs" == "false" ]; then
         install_nodejs  ${NODEJS_VERSION} ${motor_control_folder}
     fi
diff --git a/releases/09_00_00/am263x/download_components.sh b/releases/09_00_00/am263x/download_components.sh
index aa9944f..6f6b95c 100644
--- a/releases/09_00_00/am263x/download_components.sh
+++ b/releases/09_00_00/am263x/download_components.sh
@@ -72,7 +72,7 @@ else
     install_ccs     ${CCS_VERSION} ${install_dir}
     #install_clang   ${CGT_TI_ARM_CLANG_VERSION} ${clang_url_folder} ${clang_install_folder} ${clang_install_file} ${install_dir}
     install_syscfg  ${SYSCFG_VERSION} ${install_dir}
-    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${install_dir}
+    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder}
     if [ "$skip_nodejs" == "false" ]; then
         install_nodejs  ${NODEJS_VERSION} ${motor_control_folder}
     fi
diff --git a/releases/09_00_00/am64x/download_components.sh b/releases/09_00_00/am64x/download_components.sh
index 1b1846a..c0b07c7 100644
--- a/releases/09_00_00/am64x/download_components.sh
+++ b/releases/09_00_00/am64x/download_components.sh
@@ -79,7 +79,7 @@ else
     install_gcc_aarch64 ${GCC_AARCH64_VERSION} ${gcc_aarch64_install_folder} ${gcc_aarch64_download_file} ${install_dir}
     install_gcc_arm     ${GCC_ARM_VERSION}     ${gcc_arm_install_folder}     ${gcc_arm_download_file}     ${install_dir} ${GCC_ARM_VERSION_FOLDER}
     install_syscfg  ${SYSCFG_VERSION} ${install_dir}
-    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${install_dir}
+    install_mcu_plus_sdk  ${mcu_sdk_version} ${platform} ${motor_control_folder}
     if [ "$skip_nodejs" == "false" ]; then
         install_nodejs  ${NODEJS_VERSION} ${motor_control_folder}
     fi
diff --git a/scripts/common.sh b/scripts/common.sh
index 5d71d52..3474065 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -252,12 +252,14 @@ install_mcu_plus_sdk() {
     if [ ! -d "${install_dir}"/mcu_plus_sdk_${platform}_${version_underscore} ]
     then
         echo "[ mcu_plus_sdk_${platform}_${version_underscore} ]  Downloading ..."
-		pwd
-        wget ${mcu_plus_sdk_url}/${mcu_plus_sdk_download_file}
-		ls -l
+        wget ${mcu_plus_sdk_url}/${mcu_plus_sdk_download_file} 1>/dev/null
         chmod +x ${mcu_plus_sdk_download_file}
         echo "[ mcu_plus_sdk_${platform}_${version_underscore} ]  Installing ..."
-        ./${mcu_plus_sdk_download_file} --mode unattended --prefix "${install_dir}"
+        ./${mcu_plus_sdk_download_file} --mode unattended --prefix ${install_dir}
+        # Remove version value from MCU + SDK installation path
+        pushd ${install_dir}
+        mv mcu_plus_sdk_${platform}_${version_underscore} mcu_plus_sdk 1>/dev/null
+        popd
         #Clean-up
         rm ${mcu_plus_sdk_download_file} 1>/dev/null
         echo "[ mcu_plus_sdk_${platform}_${version_underscore} ]  Done ..."