Fixed issue that haltest is not ran without libmtp.

By using RPATH, make mtp-initoator-haltes include libmtp.

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

diff --git a/haltest/CMakeLists.txt b/haltest/CMakeLists.txt
index 69a041298374d786153447bfeeeca99a94c5c340..e15e4974bc79363e1755efa598e62c8d3c166876 100644 (file)
--- a/haltest/CMakeLists.txt
+++ b/haltest/CMakeLists.txt
@@ -3,6 +3,9 @@ PROJECT(gtest-mtp-initiator C CXX)
 SET(HALTEST "gtest-mtp-initiator")
 ADD_DEFINITIONS("-DUSE_DLOG")
 
+SET(CMAKE_INSTALL_RPATH "/opt/usr/data/network/lib")
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 SET(REQUIRES_LIST ${REQUIRES_LIST}
        glib-2.0
        gio-2.0
@@ -23,7 +26,7 @@ ENDFOREACH(flag)
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wall -fPIE")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie -Wl,-rpath=/opt/usr/data/network/lib -Wl,--disable-new-dtags")
 
 aux_source_directory(. sources)
 FOREACH(src ${sources})

diff --git a/packaging/mtp-initiator.spec b/packaging/mtp-initiator.spec
old mode 100755 (executable)
new mode 100644 (file)
index 9526395..5fc4457
--- a/packaging/mtp-initiator.spec
+++ b/packaging/mtp-initiator.spec
@@ -34,7 +34,8 @@ BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: pkgconfig(libmtp)
 BuildRequires: pkgconfig(capi-system-info)
 Requires: %{name} = %{version}-%{release}
-Requires: libmtp
+## Remove libmtp dependency because haltest include lipmtp package.
+#Requires: libmtp
 %description haltests
 TIZEN MTP Initiator extension for HAL test.
 
@@ -63,6 +64,17 @@ cp packaging/99-mtp.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/99-mtp.rules
 mkdir -p %{buildroot}/etc/dbus-1/system.d/
 cp -af %{_builddir}/%{name}-%{version}/packaging/org.tizen.mtp.conf %{buildroot}/etc/dbus-1/system.d/
 
+mkdir -p %{buildroot}/opt/usr/data/network/lib
+%ifarch aarch64
+unrpm %{_builddir}/%{name}-%{version}/res/libmtp-1.1.11-5.5.aarch64.rpm
+cp -af ./usr/lib64/* %{buildroot}/opt/usr/data/network/lib/
+%endif
+%ifarch armv7l armv7hl armv7nhl armv7tnhl armv7thl
+unrpm %{_builddir}/%{name}-%{version}/res/libmtp-1.1.11-5.5.armv7l.rpm
+cp -af ./usr/lib/* %{buildroot}/opt/usr/data/network/lib/
+%endif
+cp -af ./lib/udev/rules.d/*.rules  %{buildroot}/%{_prefix}/lib/udev/rules.d/
+
 %make_install
 
 install -D -m 0644 packaging/mtp-initiator.service %{buildroot}/%{_unitdir}/mtp-initiator.service
@@ -74,8 +86,10 @@ install -D -m 0644 packaging/mtp-initiator.service %{buildroot}/%{_unitdir}/mtp-
 %{_bindir}/mtp-initiator
 %{_unitdir}/mtp-initiator.service
 %{_prefix}/lib/udev/rules.d/99-mtp.rules
-%attr(644,root,root) /etc/dbus-1/system.d/org.tizen.mtp.conf
+%config %{_sysconfdir}/dbus-1/system.d/org.tizen.mtp.conf
 
 %files haltests
 %manifest %{name}.manifest
 %{_bindir}/*haltests
+%{_prefix}/lib/udev/rules.d/69-libmtp.rules
+/opt/usr/data/network/lib/*

diff --git a/res/libmtp-1.1.11-5.5.aarch64.rpm b/res/libmtp-1.1.11-5.5.aarch64.rpm
new file mode 100644 (file)
index 0000000..a624918
Binary files /dev/null and b/res/libmtp-1.1.11-5.5.aarch64.rpm differ

diff --git a/res/libmtp-1.1.11-5.5.armv7l.rpm b/res/libmtp-1.1.11-5.5.armv7l.rpm
new file mode 100644 (file)
index 0000000..cf688bd
Binary files /dev/null and b/res/libmtp-1.1.11-5.5.armv7l.rpm differ