From 8bb7ff1291c439fdbb82536db03c25ea5af26848 Mon Sep 17 00:00:00 2001 From: Ashwini Kumar Date: Tue, 19 Jul 2016 14:14:07 +0530 Subject: [PATCH] Add sample provisioning servers in package Added sample provisioning servers into the test package built Corresponding .dat files are also added to same location as binary file ,i.e. /usr/bin/provision-sample Server opens the dat file from the current location of the binary file. This needs to be updated for tizen, to be in a place out of bin, where Read-Write is possible. Change-Id: I0d13386976d2d4910934064d6092e1b360dcf919 Credit-to: Ashwini Kumar Signed-off-by: Ashwini Kumar Signed-off-by: Philippe Coval Signed-off-by: Ashwini Kumar Reviewed-on: https://gerrit.iotivity.org/gerrit/9311 Tested-by: jenkins-iotivity Reviewed-by: Mushfiqul Islam Reviewed-by: Randeep Singh Signed-off-by: Ashwini Kumar Reviewed-on: https://gerrit.iotivity.org/gerrit/9609 Reviewed-by: Ziran Sun --- resource/csdk/security/provisioning/SConscript | 2 +- tools/tizen/iotivity.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript index 0c94384..e3616c7 100644 --- a/resource/csdk/security/provisioning/SConscript +++ b/resource/csdk/security/provisioning/SConscript @@ -116,6 +116,6 @@ provisioning_env.UserInstallTargetLib(provisioningserver, 'ocpmapi') if provisioning_env.get('DTLS_WITH_X509') == '1': SConscript('ck_manager/SConscript') -if target_os in ['linux', 'msys_nt', 'windows']: +if target_os in ['linux', 'msys_nt', 'windows', 'tizen']: SConscript('sample/SConscript') diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec index 4177f08..35b7676 100644 --- a/tools/tizen/iotivity.spec +++ b/tools/tizen/iotivity.spec @@ -35,7 +35,7 @@ Requires(post): /sbin/ldconfig %endif %{!?TARGET_TRANSPORT: %define TARGET_TRANSPORT IP} -%{!?SECURED: %define SECURED 0} +%{!?SECURED: %define SECURED 1} %{!?LOGGING: %define LOGGING True} %{!?ROUTING: %define ROUTING GW} %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen} @@ -164,6 +164,10 @@ cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_included cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir} cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir} cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{buildroot}%{_libdir}/oic_svr_db_server.dat +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_justworks %{ex_install_dir}/provision-sample/ +cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{ex_install_dir}/provision-sample/ +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_randompin %{ex_install_dir}/provision-sample/ +cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat %{ex_install_dir}/provision-sample/ %endif -- 2.7.4