[TCT][Update emulator architecture from i586 to x86]

Change-Id: I13d3242480004b9552c98dcbd5e2a424d67c3bd8
Signed-off-by: jihun park <jihun87.park@samsung.com>

diff --git a/scripts_tpk/inst.sh b/scripts_tpk/inst.sh
index f6aa0318b0fafa9b26d98ff2412f96fa0f12ce30..cb5ed5202edce701260b676c4cab5cd172905de6 100755 (executable)
--- a/scripts_tpk/inst.sh
+++ b/scripts_tpk/inst.sh
@@ -185,7 +185,9 @@ fi
            applist=`ls $DEVICE_SUITE_TARGET_30/res | grep tpk | grep arm`
     elif [ "$(echo $HOSTTYPE)" == "aarch64" ]; then
            applist=`ls $DEVICE_SUITE_TARGET_30/res | grep tpk | grep aarch64`
-       elif [ "$(echo $HOSTTYPE)" == "x86_64" ]; then
+    elif [ "$(echo $HOSTTYPE)" == "x86" ]; then
+           applist=`ls $DEVICE_SUITE_TARGET_30/res | grep tpk | grep x86`
+    elif [ "$(echo $HOSTTYPE)" == "x86_64" ]; then
            applist=`ls $DEVICE_SUITE_TARGET_30/res | grep tpk | grep x86_64`
     else
            applist=`ls $DEVICE_SUITE_TARGET_30/res | grep tpk | grep i386`

diff --git a/scripts_tpk/tpk_create.sh b/scripts_tpk/tpk_create.sh
index 775e6cc081846212238bca13eb57f9d08e006c1d..8d6d52aa5eec6aba99ff0ad2a9cccae47bda9a1a 100755 (executable)
--- a/scripts_tpk/tpk_create.sh
+++ b/scripts_tpk/tpk_create.sh
@@ -415,7 +415,7 @@ UNSUPPORTED_FILE="tct_unsupported.txt"
 if [ "$ARCH_TYPE" == "arm" ]; then
        ARCH="armv7l"
 elif [ "$ARCH_TYPE" == "x86" ]; then
-       ARCH="i586"
+       ARCH="x86"
 elif [ "$ARCH_TYPE" == "aarch64" ]; then
        ARCH="aarch64"
 elif [ "$ARCH_TYPE" == "x86_64" ]; then

diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh
index 7a85c1d83bd5997c66632727f4571eddb0ef86ea..938d5f4af466160eceb514bb1b5fc6a6b7db146b 100755 (executable)
--- a/scripts_tpk/tpkbuild.sh
+++ b/scripts_tpk/tpkbuild.sh
@@ -27,7 +27,7 @@ function helpusage {
 # usage note
     echo "Usage: `basename $0` <build|install> <build_type> <module_name> <arch_type> <device_type>"
     echo "<build_type> = itc|ctc|utc"
-    echo "<arch_type> = armv7l|i586 for 32bit architecture"
+    echo "<arch_type> = armv7l|x86 for 32bit architecture"
     echo "<arch_type> = aarch64|x86_64 for 64bit architecture"
     echo "<device_type> = mobile|wearable"
     echo "commands description:"
@@ -56,14 +56,14 @@ fi
 
 if   [ "$2" = "armv7l" ] || [ "$3" = "armv7l" ] || [ "$4" = "armv7l" ] || [ "$5" = "armv7l" ]; then
        ARCH_TYPE="arm"
-elif [ "$2" = "i586" ] || [ "$3" = "i586"  ] || [ "$4" = "i586"  ] || [ "$5" = "i586"  ]; then
+elif [ "$2" = "x86" ] || [ "$3" = "x86"  ] || [ "$4" = "x86"  ] || [ "$5" = "x86"  ]; then
        ARCH_TYPE="x86"
 elif [ "$2" = "aarch64" ] || [ "$3" = "aarch64"  ] || [ "$4" = "aarch64"  ] || [ "$5" = "aarch64"  ]; then
        ARCH_TYPE="aarch64"
 elif [ "$2" = "x86_64" ] || [ "$3" = "x86_64"  ] || [ "$4" = "x86_64"  ] || [ "$5" = "x86_64"  ]; then
        ARCH_TYPE="x86_64"
 else
-       echo "Add argument '32 bit architecture (armv7l or i586)'"
+       echo "Add argument '32 bit architecture (armv7l or x86)'"
        echo "Add argument '64 bit architecture (aarch64 or x86_64)'"
        helpusage
 fi

diff --git a/scripts_tpk/tpksdk-install.py b/scripts_tpk/tpksdk-install.py
index 34f9f3250c278210987d905d016327d8bf8b9d3e..3f8c029be34c2ae9df19291b7bb055b1a664b616 100755 (executable)
--- a/scripts_tpk/tpksdk-install.py
+++ b/scripts_tpk/tpksdk-install.py
@@ -244,10 +244,10 @@ if ( len(sys.argv) >= 7 ):
 
 
 if ( arch == 'x86' ):
-       arch='i386'
+       arch='x86'
 if ( arch == 'x86_64' ):
        arch='x86_64'
-       
+
 if ( os.path.exists('install.log') ):
        os.remove('install.log')