[TCT][scripts][Non-ACR] x86 install issue fixed

Change-Id: I865494371dbfcdc2a50cfa42beac1ef50e7fd202
Signed-off-by: Tarun Kumar <tarun1.kumar@samsung.com>

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index 00aa3ec316777246bcdc70b80a0b059f956e738a..161b0e5400202fed6677e8139438b124e0d4f1f1 100755 (executable)
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -578,6 +578,8 @@ getlatestrootstrap() {
        LATEST_DATE=""
        EXISTING_ROOTSTRAP=""
        ROOTSTRAP_STRING_ARRAY=($ROOTSTRAP_LIST)
+       echo "List of installed rootstraps for ARCH: $SEARCH_ARCHITECTURE"
+       printf '%s\n' "${ROOTSTRAP_STRING_ARRAY[@]}"
        for ROOTSTRAP_NAME in "${ROOTSTRAP_STRING_ARRAY[@]}";
        do
                DATE_STR=`cut -d'.' -f 5 <<<$ROOTSTRAP_NAME`  #extracting date string from rootstrap name and finding the latest date and rootstrap
@@ -594,6 +596,7 @@ checkRootstrap() {
        PROFILE_TYPE=$2
        DEVICE_TYPE=$3
        CURRENT_VERSION=$4
+       ARCHITECTURE=$5
        if [ -z "$ROOTSTRAP_TYPE" ]; then
                echo $yellow"rootstrap.txt file is empty."$reset
                getlatestrootstrap $PROFILE_TYPE $DEVICE_TYPE $CURRENT_VERSION $ARCHITECTURE

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index b6f93c0516d581b3e57c92e50e54bcd198f5768c..1cd2b7342c0e74f961ac4ac40ea9dabeed93a013 100755 (executable)
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -155,16 +155,14 @@ function install {
                fi
        fi
 
-       ROOTSTRAP_FILE=$(readlink -f rootstrap.txt)
-       ROOTSTRAP_NAME=`cat $ROOTSTRAP_FILE | grep "${PROFILE_TYPE}_$ARCH_TYPE:" | cut -f 2- -d ':'`
-       ROOTSTRAP_ARCH=`tizen list rootstrap | grep "${ROOTSTRAP_NAME}" | cut -f4 -d' '`
+       ROOTSTRAP_ARCH_X86=i586
        if [ "$ARCH_TYPE" == "arm" ] || [ "$ARCH_TYPE" == "aarch64" ] ; then
                ln -sf ./scripts_tpk/tpk-install.py $PWD/tpk-install
                python tpk-install $ARCH_TYPE $PROFILE_TYPE $TC_COUNT $IS_COVERAGE $TC_TYPE $MOD_NAME
        elif [ "$ARCH_TYPE" == "x86" ] || [ "$ARCH_TYPE" == "x86_64" ] ; then
                ln -sf ./scripts_tpk/tpksdk-install.py $PWD/tpksdk-install
-               if [ "$ROOTSTRAP_ARCH" == "i586" ]; then
-                       python tpksdk-install $ROOTSTRAP_ARCH $PROFILE_TYPE $TC_COUNT $IS_COVERAGE $TC_TYPE $MOD_NAME
+               if [ "$ARCH_TYPE" == "x86" ] ; then
+                       python tpksdk-install $ROOTSTRAP_ARCH_X86 $PROFILE_TYPE $TC_COUNT $IS_COVERAGE $TC_TYPE $MOD_NAME
                else
                        python tpksdk-install $ARCH_TYPE $PROFILE_TYPE $TC_COUNT $IS_COVERAGE $TC_TYPE $MOD_NAME
                fi