iotivity: update to version 1.1.0

This brings IoTivoity to version 1.1.0
The old @lantiq.com address does not work any more, update to the
@intel.com address.

The removed patches were merged upstream, but there are still some new ones needed.

Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
This commit is contained in:
Hauke Mehrtens
2016-06-29 23:30:15 +02:00
parent 17481f5b2d
commit 6248f9a029
16 changed files with 454 additions and 239 deletions
+9 -7
View File
@@ -1,6 +1,6 @@
--- a/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript
+++ b/resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript
@@ -31,7 +31,7 @@ this_build_dir = os.path.join(root_build
@@ -73,7 +73,7 @@ env.AppendUnique(
# The Linux BLE adapter implementation uses GDBus to make D-Bus based
# method calls to BlueZ. Pull in the necessary dependencies.
@@ -22,12 +22,14 @@
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -73,7 +73,7 @@ provisioning_env.AppendUnique(LIBS = ['t
@@ -76,8 +76,8 @@ provisioning_env.AppendUnique(LIBS = ['t
if env.get('DTLS_WITH_X509') == '1':
provisioning_env.AppendUnique(LIBS = ['CKManger'])
provisioning_env.AppendUnique(LIBS = ['CKManager', 'asn1'])
-provisioning_env.ParseConfig('pkg-config --libs glib-2.0');
+# provisioning_env.ParseConfig('pkg-config --libs glib-2.0');
-if target_os != 'android':
- provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
+# if target_os != 'android':
+# provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
if target_os == 'android':
provisioning_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
if target_os == 'tizen':
provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3')