From 1ce6059b98fbe0bd326714121dabbaf9be6a1851 Mon Sep 17 00:00:00 2001
From: Aleksander Mistewicz <a.mistewicz@samsung.com>
Date: Wed, 26 Oct 2016 16:39:55 +0200
Subject: [PATCH] Update tct/artik_prepare_flash_conf.sh

Remove external dependency, image repack, etc.

Change-Id: I35ee25e425e84e886f3c6d9f76356947da409111
Signed-off-by: Aleksander Mistewicz <a.mistewicz@samsung.com>
---
 tct/artik_prepare_flash_conf.sh | 26 ++++++++++++--------------
 tct/common.sh                   |  1 +
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/tct/artik_prepare_flash_conf.sh b/tct/artik_prepare_flash_conf.sh
index 9e5796b..2c7669b 100755
--- a/tct/artik_prepare_flash_conf.sh
+++ b/tct/artik_prepare_flash_conf.sh
@@ -53,10 +53,15 @@ mkdir -p "${T_DIR}"
 
 IMAGE_UNPACKED="${T_DIR}/unpacked"
 IMAGE_MOUNTPOINT="${T_DIR}/mounted"
-TMP_TAR="${T_DIR}/tizen-${SDMUX}.tar"
 
 switch2testserver "${SDMUX}"
 
+unpack_image "${BOOT_IMAGE}" "${IMAGE_UNPACKED}"
+
+mount_image "${IMAGE_UNPACKED}/boot.img" "${IMAGE_MOUNTPOINT}"
+replace_params "${IMAGE_MOUNTPOINT}"
+unmount_image "${IMAGE_MOUNTPOINT}"
+
 unpack_image "${USR_IMAGE}" "${IMAGE_UNPACKED}"
 
 mount_image "${IMAGE_UNPACKED}/rootfs.img" "${IMAGE_MOUNTPOINT}"
@@ -64,29 +69,23 @@ install_iserial "${SDMUX}" "${IMAGE_MOUNTPOINT}"
 set_usb_mode "${IMAGE_MOUNTPOINT}"
 install_hdmi_force "${IMAGE_MOUNTPOINT}"
 unmount_image "${IMAGE_MOUNTPOINT}"
-tar cvf "${TMP_TAR}" -C "${IMAGE_UNPACKED}" $(tar tf "${USR_IMAGE}") || die "tar: failed"
 
 echo "### flash ###"
 
 UUID_FILE="/var/tmp/uuid-${SDMUX}"
 DEV_SDCARD=$(uuid2dev "${UUID_FILE}" "${SDMUX}") || die "sdcard not found!"
-
-ARTIK_FLASH_SCRIPT_DIR="$(dirname "${ARTIK_FLASH_SCRIPT}")"
-cd "${ARTIK_FLASH_SCRIPT_DIR}"
-TMP_BOOT_IMG="${ARTIK_FLASH_SCRIPT_DIR}/tizen-boot-${SDMUX}.tar"
-PLATFORM_IMG="${ARTIK_FLASH_SCRIPT_DIR}/tizen-${SDMUX}.tar"
-mv "${BOOT_IMG}" "${TMP_BOOT_IMG}"
-mv "${TMP_TAR}" "${PLATFORM_IMG}"
-sudo "${ARTIK_FLASH_SCRIPT}" -d "${DEV_SDCARD}" -m "${MODEL}" -p "tizen-${SDMUX}.tar" -b "tizen-boot-${SDMUX}.tar"
-cd "${OLDPWD}"
+cd "${IMAGE_UNPACKED}"
+"${TESTLAB_SCRIPTS}/flash/flash_dd_artik.sh" "${DEV_SDCARD}"
 RET=$?
+cd "${OLDPWD}"
 
 change_uuid "${UUID_FILE}" "${DEV_SDCARD}"
 if [ $RET -ne 0 ]; then
-    die "${ARTIK_FLASH_SCRIPT} exited with an error" "$RET"
+    die "flash_dd_artik exited with an error" "$RET"
 fi
+
 switch2device "${SDMUX}"
-restart_device "${SDMUX}"
+restart_device "${SDMUX}" "${ARTIK_RESTART_SLEEP}"
 dyper_restart "${SDMUX}" "dyper1"
 
 echo "### conf ###"
@@ -103,4 +102,3 @@ echo "CONNECT_CNT $CONNECT_CNT" > sysctl.result
 echo "### cleanup ###"
 
 rm -rf "${T_DIR}"
-rm "${PLATFORM_IMG}"
diff --git a/tct/common.sh b/tct/common.sh
index 38477a8..960375a 100755
--- a/tct/common.sh
+++ b/tct/common.sh
@@ -36,6 +36,7 @@ MAX_SLEEP=140
 TL_IP_CONF="/etc/opt/testlab-major/ip_addr"
 SCREENSHOOTER_RPM="/opt/screenshooter.rpm"
 ARTIK_FLASH_SCRIPT="/opt/sdboot/mk_sdboot.sh"
+ARTIK_RESTART_SLEEP="5000"
 
 BMAP_TIME_LIMIT="600"
 
-- 
2.7.4