replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / csdk / stack / samples / tizen / build / gbsbuild.sh

diff --git a/resource/csdk/stack/samples/tizen/build/gbsbuild.sh b/resource/csdk/stack/samples/tizen/build/gbsbuild.sh
old mode 100644 (file)
new mode 100755 (executable)
index 97e77bd..bde1850
--- a/resource/csdk/stack/samples/tizen/build/gbsbuild.sh
+++ b/resource/csdk/stack/samples/tizen/build/gbsbuild.sh
@@ -51,10 +51,8 @@ mkdir ./tmp
 mkdir ./tmp/extlibs/
 mkdir ./tmp/packaging
 cp -LR ./extlibs/tinycbor $sourcedir/tmp/extlibs
-rm -rf $sourcedir/tmp/extlibs/tinycbor/tinycbor/.git
 cp -Rf ./extlibs/mbedtls $sourcedir/tmp/extlibs
 cp -R ./extlibs/cjson $sourcedir/tmp/extlibs
-cp -R ./extlibs/tinydtls $sourcedir/tmp/extlibs
 cp -R ./extlibs/timer $sourcedir/tmp/extlibs
 cp -R ./extlibs/rapidxml $sourcedir/tmp/extlibs
 cp -R ./extlibs/libcoap $sourcedir/tmp/extlibs
@@ -89,21 +87,11 @@ cp -R $sourcedir/iotivity.pc.in $sourcedir/tmp/
 cd $sourcedir/tmp
 
 echo `pwd`
+# Prepare mbedTLS dependency
+$SHELL ./extlibs/mbedtls/prep.sh
 
-# Apply OCF patch on upstream's git only once
-# Note, If building from scratch using GBS, git patches are more convenient
-mbedtls_revision="ad249f509fd62a3bbea7ccd1fef605dbd482a7bd"
-mbedtls_dir="./extlibs/mbedtls/mbedtls/"
-if [ -f "${mbedtls_dir}/.git/HEAD" ];then
-    cd "${mbedtls_dir}"
-    git reset --hard "${mbedtls_revision}"
-    git apply --whitespace=fix "../ocf.patch"
-    cd -
-    rm -rf "${mbedtls_dir}/.git"
-else
-    echo "tizen: Checking if ocf.patch is applied in ${mbedtls_dir}"
-    grep -r 'TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256' "${mbedtls_dir}"
-fi
+# Prepare TinyCBOR dependency
+$SHELL ./extlibs/tinycbor/prep.sh
 
 whoami
 # Initialize Git repository