From 14e54712d2c13a5b76a2e9b037469080753bce8e Mon Sep 17 00:00:00 2001 From: "saerome.kim" Date: Fri, 5 Jan 2018 15:31:27 +0900 Subject: [PATCH] Fix build error Signed-off-by: saerome.kim --- install.sh | 2 +- packaging/d2d-manager.spec | 32 +++++++++++++++++++++++++++++++- src/d2d-subowner/d2ds-subowner.c | 8 +++++--- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index afba908..9ae6242 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ sdb root on sdb shell mount -o remount,rw / sdb push ~/GBS-ROOT/50std/local/repos/tizen50std/armv7l/RPMS/d2d-manager-* /tmp/ -sdb shell rpm -Uvh --force /tmp/*.rpm +sdb shell rpm -Uvh --force --nodeps /tmp/*.rpm sync #sdb dlog -c #sdb dlog -v time D2D_SUBOWNER OIC_PM_UTILITY OIC_RI_STACK OIC_CA_CONN_MGR OIC_CA_PRTCL_MSG OIC_RI_CLIENTCB OIC_RM_UTIL OIC_RM_RAP diff --git a/packaging/d2d-manager.spec b/packaging/d2d-manager.spec index 54e611e..b751f3d 100644 --- a/packaging/d2d-manager.spec +++ b/packaging/d2d-manager.spec @@ -13,6 +13,7 @@ Source6: fnm.service Source7: net.fnm.service Source8: d2ds.service Source9: net.d2ds.service +Source10: capi-network-familynet.manifest BuildRequires: cmake BuildRequires: pkgconfig(iotivity) @@ -41,6 +42,22 @@ Requires: %{name} = %{version}-%{release} %description devel This package contains the development files for %{name}. +%package capi +Summary: D2D Manager CAPI +Group: Network & Connectivity/Other +Requires: %{name} = %{version}-%{release} + +%description capi +D2D Manager CAPI. + +%package capi-devel +Summary: D2D Manager CAPI (Development) +Group: Network & Connectivity/Other +Requires: %{name} = %{version}-%{release} + +%description capi-devel +This package contains the development files for %{name} CAPI. + %prep %setup -q chmod 644 %{SOURCE0} @@ -52,6 +69,7 @@ chmod 644 %{SOURCE6} chmod 644 %{SOURCE7} chmod 644 %{SOURCE8} chmod 644 %{SOURCE9} +chmod 644 %{SOURCE10} cp %{SOURCE2} . cp %{SOURCE3} . @@ -61,6 +79,7 @@ cp %{SOURCE6} . cp %{SOURCE7} . cp %{SOURCE8} . cp %{SOURCE9} . +cp %{SOURCE10} . %build CFLAGS=$(echo $CFLAGS | sed 's/-O2/-O0/' | sed 's/-O1/-O0/' | sed 's/-Wp,-D_FORTIFY_SOURCE=2//') @@ -121,7 +140,6 @@ rm -rf %{NETWORK_FW_DATADIR}/oic_pdm_subowner.db-journal #%{NETWORK_FW_DATADIR}/oic_svr_db_client_devowner.dat #%{NETWORK_FW_DATADIR}/oic_svr_db_client_directpairing.dat #%{NETWORK_FW_DATADIR}/oic_svr_db_client_nondevowner.dat -%{NETWORK_FW_DATADIR}/oic_svr_db_server_justworks.dat #%{NETWORK_FW_DATADIR}/oic_svr_db_randompin_with_empty_deviceid.dat #%{NETWORK_FW_DATADIR}/oic_svr_db_server_justworks_default.dat #%{NETWORK_FW_DATADIR}/oic_svr_db_server_justworks_protectedDB_plain.dat @@ -130,8 +148,20 @@ rm -rf %{NETWORK_FW_DATADIR}/oic_pdm_subowner.db-journal #%{NETWORK_FW_DATADIR}/oic_svr_db_server_preconfpin.dat %{NETWORK_FW_DATADIR}/oic_svr_db_client.dat %{NETWORK_FW_DATADIR}/oic_svr_db_server.dat +%{NETWORK_FW_DATADIR}/oic_svr_db_server_justworks.dat %{NETWORK_FW_DATADIR}/oic_svr_db_subowner_client.dat %attr(750,network_fw,network_fw) %{_sbindir}/ocserverbasicops %attr(750,network_fw,network_fw) %{_sbindir}/sampleserver_justworks %attr(750,network_fw,network_fw) %{_sbindir}/provisioningclient %attr(750,network_fw,network_fw) %{_sbindir}/subownerclient + +%files capi +%manifest capi-network-familynet.manifest +%defattr(-,root,root,-) +%{_libdir}/libcapi-network-familynet.so* + +%files capi-devel +%{_includedir}/*.h +%{_libdir}/pkgconfig/*.pc +%{_libdir}/libcapi-network-familynet.so +%attr(777,root,root) %{_bindir}/familynet_unit_test diff --git a/src/d2d-subowner/d2ds-subowner.c b/src/d2d-subowner/d2ds-subowner.c index 31c03d2..83d8b24 100644 --- a/src/d2d-subowner/d2ds-subowner.c +++ b/src/d2d-subowner/d2ds-subowner.c @@ -36,7 +36,7 @@ #include "ocprovisioningmanager.h" #include "oxmjustworks.h" #include "oxmrandompin.h" -//#include "srmutility.h" +#include "srmutility.h" #include "securevirtualresourcetypes.h" #include "security/srmutility.h" #include "pmtypes.h" @@ -72,6 +72,8 @@ static const char* PRVN_DB_FILE_NAME = "oic_pdm_d2ds.db"; static const OicSecPrm_t SUPPORTED_PRMS[2] = { PRM_PRE_CONFIGURED, PRM_RANDOM_PIN }; #endif +OCStackResult GetDoxmDevOwnerId(OicUuid_t *devownerid); + typedef struct { d2ds_cmd_id_e cid; /**< Command ID */ int tid; /**< Timer ID */ @@ -396,7 +398,7 @@ static int _set_device_id_seed(void) { int ret = WIFI_MANAGER_ERROR_NONE; gchar *mac_addr = NULL; - const gchar *test_mac = "00:12:36:11:22:33"; + gchar *test_mac = "00:12:36:11:22:33"; wifi_manager_h wifi_handle = NULL; bool wifi_activated = false; @@ -417,7 +419,7 @@ static int _set_device_id_seed(void) if (WIFI_MANAGER_ERROR_NONE != ret) { D2DS_LOGE("Fail to get MAC address [%d][%s]", ret, _wifi_error_to_string(ret)); /* Make deviceID based on Fake MAC address */ - ret = SetDeviceIdSeed(test_mac, WIFI_MAC_ADDR_LENGTH); + ret = SetDeviceIdSeed((const guchar *)test_mac, WIFI_MAC_ADDR_LENGTH); } else { /* Make deviceID based on Wi-Fi MAC address */ ret = SetDeviceIdSeed((const guchar *)mac_addr, WIFI_MAC_ADDR_LENGTH); -- 2.7.4