Temporarlly remove private iotivity packages.

Change-Id: Ib7710f9490eae0af27a03809682f8bff813d4482
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6297611153f6c586cc334a9b6ae5bfb201622c97..39827d9b6a7549be14c91c181cf8666d9b7208c8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,20 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/capi/include)
 
 MESSAGE(" - Checking...packages dependency")
-SET(COMMON_DEPS glib-2.0 gio-2.0 gio-unix-2.0 dlog dbus-1 iotivity uuid capi-base-common capi-system-info vconf boost gmock sqlite3 capi-system-system-settings)
+SET(COMMON_DEPS glib-2.0
+       gio-2.0
+       gio-unix-2.0
+       dlog
+       dbus-1
+       iotivity
+       uuid
+       capi-base-common
+       capi-system-info
+       vconf
+       boost
+       gmock
+       sqlite3
+       capi-system-system-settings)
 IF (LINUX)
     PKG_CHECK_MODULES(daemon_pkgs REQUIRED ${COMMON_DEPS})
     ADD_DEFINITIONS("-DLINUX")
@@ -23,6 +36,7 @@ ELSE ()
 ENDIF()
 
 MESSAGE(" - Adding external C flags")
+
 FOREACH(flag ${daemon_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
        SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
@@ -31,10 +45,10 @@ ENDFOREACH(flag)
 IF(BUILD_GCOV)
        SET(GTEST_CFLAGS " -fprofile-arcs -ftest-coverage")
 ENDIF(BUILD_GCOV)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${GCOV_CFLAGS} -Wall -fPIE -fpic -std=gnu99")
-SET(CMAKE_CXX_FLAGS "${EXTRA_CXXFLAGS} ${GTEST_CFLAGS} -std=gnu++11 -fPIC -Wall -Werror-implicit-function-declaration -fvisibility=hidden")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie -Wl,-rpath=/opt/usr/data/network/lib -Wl,--disable-new-dtags")
+SET(RELO_FLAGS "-D_FORTIFY_SOURCE=2 -Wl,-z,relro")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${RELO_FLAGS} ${GCOV_CFLAGS} ${GTEST_CFLAGS} -Wall -fPIE -fpic -std=gnu99")
+SET(CMAKE_CXX_FLAGS "${EXTRA_CXXFLAGS} ${RELO_FLAGS} ${GCOV_CFLAGS} ${GTEST_CFLAGS} -std=gnu++11 -fPIC -Wall -Werror-implicit-function-declaration -fvisibility=hidden")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie -Wl,--disable-new-dtags")
 
 MESSAGE(" - Define...iotivity macro")
 ADD_DEFINITIONS("-D__TIZEN__")

diff --git a/packaging/mdg-manager.spec b/packaging/mdg-manager.spec
index 066529f75fc1975dbee08d0404e1aa5a1f58d8b0..d876639027d572f580fbd2830b71a86323504737 100644 (file)
--- a/packaging/mdg-manager.spec
+++ b/packaging/mdg-manager.spec
@@ -45,20 +45,19 @@ cp %{SOURCE3} .
 
 
 %build
-CFLAGS=$(echo $CFLAGS | sed 's/-O2/-O0/' | sed 's/-O1/-O0/' | sed 's/-Wp,-D_FORTIFY_SOURCE=2//')
-CXXFLAGS=$(echo $CXXFLAGS | sed 's/-O2/-O0/' | sed 's/-O1/-O0/' | sed 's/-Wp,-D_FORTIFY_SOURCE=2//')
-
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
 %define NETWORK_FW_DATADIR %{TZ_SYS_GLOBALUSER_DATA}/network
 %define DBDIR %{TZ_SYS_GLOBALUSER_DATA}/
 
 %cmake . \
-    -DMAJORVER=${MAJORVER} -DFULLVER=%{version} \
-       -DLIB_DIR=%{_libdir} -DBIN_DIR=%{_bindir} -DSBIN_DIR=%{_sbindir} \
+    -DMAJORVER=${MAJORVER} \
+       -DFULLVER=%{version} \
+       -DLIB_DIR=%{_libdir} \
+       -DBIN_DIR=%{_bindir} \
+       -DSBIN_DIR=%{_sbindir} \
        -DNETWORK_FW_DATADIR=%{NETWORK_FW_DATADIR} \
-       -DDBDIR=%{DBDIR}
-make %{?_smp_mflags}
+       -DDBDIR=%{DBDIR} \
 
 %install
 rm -rf %{buildroot}/BUILD/%{name}*
@@ -66,14 +65,6 @@ rm -rf %{buildroot}/BUILD/%{name}*
 mkdir -p %{buildroot}/etc/dbus-1/system.d/
 mkdir -p %{buildroot}/opt/usr/data/network/lib
 cp -af %{_builddir}/%{name}-%{version}/packaging/org.tizen.mdg.conf %{buildroot}/etc/dbus-1/system.d/
-unrpm %{_builddir}/%{name}-%{version}/resources/*.rpm
-cp -af ./usr/lib/libconnectivity_abstraction.so %{buildroot}/opt/usr/data/network/lib
-cp -af ./usr/lib/liboc_logger.so %{buildroot}/opt/usr/data/network/lib
-cp -af ./usr/lib/libocprovision.so %{buildroot}/opt/usr/data/network/lib
-cp -af ./usr/lib/liboctbstack.so %{buildroot}/opt/usr/data/network/lib
-cp -af ./usr/lib/liboc_logger_core.so %{buildroot}/opt/usr/data/network/lib
-cp -af ./usr/lib/libocpmapi.so %{buildroot}/opt/usr/data/network/lib
-cp -af ./usr/lib/liboc.so %{buildroot}/opt/usr/data/network/lib
 
 %make_install
 
@@ -100,4 +91,3 @@ rm -rf /opt/usr/dbspace/.mdgd.db-journal
 %attr(644,root,root) %{_unitdir}/mdgd.service
 %attr(644,network_fw,network_fw) %{NETWORK_FW_DATADIR}/oic_svr_db_mdgd_manager.dat
 %attr(644,root,root) /etc/dbus-1/system.d/org.tizen.mdg.conf
-/opt/usr/data/network/lib/*.so

diff --git a/resources/iotivity-1.2.1-0.armv7l.rpm b/resources/iotivity-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index 1d01b86..0000000
Binary files a/resources/iotivity-1.2.1-0.armv7l.rpm and /dev/null differ

diff --git a/resources/iotivity-debuginfo-1.2.1-0.armv7l.rpm b/resources/iotivity-debuginfo-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index 7ef77e7..0000000
Binary files a/resources/iotivity-debuginfo-1.2.1-0.armv7l.rpm and /dev/null differ

diff --git a/resources/iotivity-debugsource-1.2.1-0.armv7l.rpm b/resources/iotivity-debugsource-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index 111fecc..0000000
Binary files a/resources/iotivity-debugsource-1.2.1-0.armv7l.rpm and /dev/null differ

diff --git a/resources/iotivity-devel-1.2.1-0.armv7l.rpm b/resources/iotivity-devel-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index 7318b8d..0000000
Binary files a/resources/iotivity-devel-1.2.1-0.armv7l.rpm and /dev/null differ

diff --git a/resources/iotivity-service-1.2.1-0.armv7l.rpm b/resources/iotivity-service-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index 3c62d79..0000000
Binary files a/resources/iotivity-service-1.2.1-0.armv7l.rpm and /dev/null differ

diff --git a/resources/iotivity-service-debuginfo-1.2.1-0.armv7l.rpm b/resources/iotivity-service-debuginfo-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index 592c41e..0000000
Binary files a/resources/iotivity-service-debuginfo-1.2.1-0.armv7l.rpm and /dev/null differ

diff --git a/resources/iotivity-test-1.2.1-0.armv7l.rpm b/resources/iotivity-test-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index 379edef..0000000
Binary files a/resources/iotivity-test-1.2.1-0.armv7l.rpm and /dev/null differ

diff --git a/resources/iotivity-test-debuginfo-1.2.1-0.armv7l.rpm b/resources/iotivity-test-debuginfo-1.2.1-0.armv7l.rpm
deleted file mode 100644 (file)
index b93096d..0000000
Binary files a/resources/iotivity-test-debuginfo-1.2.1-0.armv7l.rpm and /dev/null differ