diff options
| author | Hyotaek Shim <hyotaek.shim@samsung.com> | 2018-06-01 11:14:11 +0900 |
|---|---|---|
| committer | Susnata Sovalin <s.sovalin@samsung.com> | 2018-06-01 13:22:46 +0530 |
| commit | be8dae7fe041340beca904de73b693a4ae92075c (patch) | |
| tree | b70ffda6a64abc5af615ce88d3ac89cf9f5dd05b | |
| parent | f5e603ae1865bf32362f1d3ba742c3c014cd64ff (diff) | |
| download | lbs-server-tizen_4.0.tar.gz lbs-server-tizen_4.0.tar.bz2 lbs-server-tizen_4.0.zip | |
Add lbs-server.service adaptation for ASANsubmit/tizen_4.0/20180601.080820accepted/tizen/4.0/unified/20180605.090409tizen_4.0accepted/tizen_4.0_unified
MemoryLimit=30M is required to avoid memory limit violation on ASAN binary.
Change-Id: I793ed613699571f68e809dc50ecca34c606c99c5
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
(cherry picked from commit 7ff771adfe7edc47e8effc8662d9221131339dbf)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/lbs-server.asan.conf | 2 | ||||
| -rw-r--r-- | packaging/lbs-server.spec | 9 |
3 files changed, 12 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8323827..9abc10b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ ADD_DEFINITIONS("-DLIB_DIR=\"${LIB_DIR}\"") MESSAGE("<<< LIB_DIR=${LIB_DIR} >>>") MESSAGE(${CMAKE_C_FLAGS}) -MESSAGE(${CMAKE_EXE_LINKER_FLAGS}) +#MESSAGE(${CMAKE_EXE_LINKER_FLAGS}) ADD_SUBDIRECTORY(module) ADD_SUBDIRECTORY(lbs-server) diff --git a/packaging/lbs-server.asan.conf b/packaging/lbs-server.asan.conf new file mode 100644 index 0000000..85be7c2 --- /dev/null +++ b/packaging/lbs-server.asan.conf @@ -0,0 +1,2 @@ +[Service] +MemoryLimit=30M diff --git a/packaging/lbs-server.spec b/packaging/lbs-server.spec index d20d5d5..5418026 100644 --- a/packaging/lbs-server.spec +++ b/packaging/lbs-server.spec @@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz Source1: lbs-server.service Source2: lbs-server.manifest Source3: location-lbs-server.manifest +Source4: lbs-server.asan.conf BuildRequires: cmake BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(network) @@ -53,6 +54,7 @@ This package provides header files and pkgconfig file for LBS Server plugin cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . +cp %{SOURCE4} . %build @@ -77,6 +79,10 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/lbs-server.service %install_service multi-user.target.wants lbs-server.service +%if "%{asan}" == "1" +mkdir -p %{buildroot}%{_unitdir}/lbs-server.service.d +install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/lbs-server.service.d/lbs-server.asan.conf +%endif chmod 755 %{buildroot}/etc/rc.d/init.d/lbs-server mkdir -p %{buildroot}/etc/rc.d/rc5.d @@ -111,6 +117,9 @@ rm -rf %{buildroot} /etc/rc.d/rc5.d/S90lbs-server %{_unitdir}/lbs-server.service %{_unitdir}/multi-user.target.wants/lbs-server.service +%if "%{asan}" == "1" +%{_unitdir}/lbs-server.service.d/lbs-server.asan.conf +%endif /opt/etc/dump.d/module.d/dump_gps.sh %files -n location-lbs-server |