From: Philippe Coval Date: Wed, 28 Sep 2016 15:44:35 +0000 (+0200) Subject: tizen: Ship renamed libuuid into RPM for SDK X-Git-Tag: 1.3.0~1054^2~131 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17e301f4a71b39b0a9e2a68fdf999b2b1dd4aec3;p=platform%2Fupstream%2Fiotivity.git tizen: Ship renamed libuuid into RPM for SDK This way produced RPM can be installed on target or imported in SDK. libuuid.so.1 is pulled by pkgconfig from com-oic-ri.spec then it will be installed correctly if using "rpm -i *.rpm", Overiding system libs in packaging, is not encouraged: Observed issue on Tizen:2.4:Mobile (TM1) : sdb shell su -c "rpm -i /opt/usr/media/Others/GBS-ROOT-RI-OIC/*.rpm" file /usr/lib/libuuid.so.1 from install of com-oic-ri-1.2.0-0.armv7l \ conflicts with file from package libuuid-2.20.2-4.139.slp.armv7l But if we want to unpack RPM contents to be used along Tizen-sdk, as app, then uuid is also needed (because SDK is missing it from its sysroot). So application need to be linked with -luuid1 (same just renamed), to avoid collision. For more details about building IoTivity for Tizen along SDK, please check: https://wiki.iotivity.org/tizen Change-Id: Iabed0221618d0d602f440e3527e1824177395ee1 Bug: https://jira.iotivity.org/browse/IOT-1343 Origin: https://gerrit.iotivity.org/gerrit/#/c/12471 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/12471 Tested-by: jenkins-iotivity Reviewed-by: Abhishek Sharma Reviewed-by: Ashok Babu Channa (cherry picked from commit 8a3ea331f4c08296a2e11185a780de7f17d42956) Reviewed-on: https://gerrit.iotivity.org/gerrit/12719 --- diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec index 03858ff..e3c14c1 100644 --- a/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec +++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/packaging/com.oic.ri.sample.spec @@ -12,6 +12,7 @@ License: Apache-2.0 Group: Applications/OICSample BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(uuid) BuildRequires: boost-devel BuildRequires: boost-thread BuildRequires: boost-system diff --git a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec index dba8af3..0a4a67e 100644 --- a/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec +++ b/resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec @@ -53,7 +53,10 @@ cp -f %{ROOTDIR}/resource/c_common/libc_common.a %{buildroot}/%{_libdir} cp -f %{ROOTDIR}/resource/csdk/security/libocsrm.a %{buildroot}/%{_libdir} cp -f %{ROOTDIR}/resource/csdk/connectivity/src/libconnectivity_abstraction.so %{buildroot}/%{_libdir} cp -f %{ROOTDIR}/extlibs/libcoap/libcoap.a %{buildroot}/%{_libdir} -cp /usr/lib/libuuid.so.1 %{buildroot}%{_libdir} +# Renamed to avoid colision with system package +# I suppose it was added to be used along Tizen SDK which does not ship it +cp /usr/lib/libuuid.so.1 %{buildroot}%{_libdir}/libuuid1.so + if echo %{SECURED}|grep -qi '1'; then cp -f %{ROOTDIR}/out/tizen/*/*/extlibs/tinydtls/libtinydtls.a %{buildroot}/%{_libdir} cp -f %{ROOTDIR}/out/tizen/*/*/libmbedcrypto.a %{buildroot}/%{_libdir}