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

Change-Id: I865494371dbfcdc2a50cfa42beac1ef50e7fd202
Signed-off-by: Tarun Kumar <tarun1.kumar@samsung.com>
(cherry picked from commit 96d158feea894f6caeb98a34f3b3d6c353e54e5c)

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index ab911e1cb03bb4a03186b2ff8fba276d03c2f6b7..1b0d1b7272e2d0d78c6e7770aa9e2b8d84f46e2b 100755 (executable)
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -563,6 +563,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'.' -f5 <<<$ROOTSTRAP_NAME"  #extracting date string from rootstrap name and finding the latest date and rootstrap
@@ -579,6 +581,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 4be05309aa6f79baab8abbaf39744811837844b2..a55e81d199bf2bdcca5f1e479a49ca9a45c8d51c 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