target_os = env.get('TARGET_OS')
root_dir = env.get('SRC_DIR')
mbedtls_dir = os.path.join(root_dir, 'extlibs','mbedtls','mbedtls/')
+mbedtls_revision = 'ad249f509fd62a3bbea7ccd1fef605dbd482a7bd'
if not os.path.exists(mbedtls_dir):
print '''
***********************************************************************************
'''
Exit(1)
-#Apply patch to enable TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256 ciphersuite and server identity hint
-#For tizen platform patch is applied by gbsbuild script
-if target_os != 'tizen':
- start_dir = os.getcwd()
- os.chdir(mbedtls_dir)
- cmd = 'git checkout development && git reset --hard ad249f509fd62a3bbea7ccd1fef605dbd482a7bd && git apply --whitespace=fix ../ocf.patch'
+start_dir = os.getcwd()
+os.chdir(mbedtls_dir)
+# Apply ocf patch on git revision
+if os.path.exists('.git/HEAD'):
+ cmd = 'git checkout development && git reset --hard ' + mbedtls_revision + ' && git apply --whitespace=fix ../ocf.patch'
os.system(cmd)
- os.chdir(start_dir)
+else:
+ print 'mbedtls: Assume ocf.patch (TLS_ECDH_ANON_WITH_AES_128_CBC_SHA256) was applied in %s' % mbedtls_dir
+os.chdir(start_dir)
mbedtls_env = env.Clone()
echo `pwd`
-if [ -d ./extlibs/mbedtls/mbedtls ];then
- cd ./extlibs/mbedtls/mbedtls
- git reset --hard ad249f509fd62a3bbea7ccd1fef605dbd482a7bd ; git apply --whitespace=fix ../ocf.patch
+# 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 ./extlibs/mbedtls/mbedtls/.git*
+ 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
whoami