1e28dfe214
This does the following changes: * update to version 1.2.1 * add iotivity-resource-directory-lib, this is needed by most applications now * do not activate security support by default, this caused some problems and needs some more settings to setup. * use sqlite version from normal package feed instead of using an own version * build against LEDE version of mbedtls * update example security configuration * remove some patches that went upstream * add some new patches fixing problems observed in my environment, most of them are on their way upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
Make it possible to use system mbedtls version
|
|
|
|
--- a/resource/csdk/connectivity/src/SConscript
|
|
+++ b/resource/csdk/connectivity/src/SConscript
|
|
@@ -73,16 +73,7 @@ if env.get('SECURED') == '1':
|
|
env.AppendUnique(CPPPATH = [src_dir + '/resource/csdk/security/include'])
|
|
env.AppendUnique(CPPDEFINES = ['__WITH_DTLS__'])
|
|
env.AppendUnique(CPPPATH = [os.path.join(root_dir, 'external/inc')])
|
|
- tls_path = 'extlibs/mbedtls';
|
|
- tls_headers_path = 'mbedtls/include';
|
|
- if ca_os == 'tizen' and os.path.exists(root_dir + '/' + tls_path):
|
|
- env.SConscript(os.path.join(root_dir, tls_path + '/SConscript'))
|
|
- env.AppendUnique(CPPPATH = [os.path.join(root_dir, tls_path + '/' + tls_headers_path)])
|
|
- else:
|
|
- if ca_os != 'android':
|
|
- env.SConscript('#' + tls_path + '/SConscript')
|
|
- env.AppendUnique(CPPPATH = ['#' + tls_path + '/' + tls_headers_path])
|
|
- env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')])
|
|
+ env.AppendUnique(CA_SRC = [os.path.join(ca_path, 'adapter_util/ca_adapter_net_ssl.c')])
|
|
|
|
if ((secured == '1') and (with_tcp == True)):
|
|
env.AppendUnique(CPPDEFINES = ['__WITH_TLS__'])
|