From: Hyotaek Shim Date: Fri, 1 Jun 2018 02:14:11 +0000 (+0900) Subject: Add lbs-server.service adaptation for ASAN X-Git-Tag: submit/tizen/20180911.092154~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ff771adfe7edc47e8effc8662d9221131339dbf;p=platform%2Fcore%2Flocation%2Flbs-server.git Add lbs-server.service adaptation for ASAN MemoryLimit=30M is required to avoid memory limit violation on ASAN binary. Change-Id: I793ed613699571f68e809dc50ecca34c606c99c5 Signed-off-by: Hyotaek Shim --- 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 34faaba..19a9f2a 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) @@ -54,6 +55,7 @@ This package provides header files and pkgconfig file for LBS Server plugin cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . +cp %{SOURCE4} . %build @@ -81,6 +83,10 @@ mkdir -p %{buildroot}%{TZ_SYS_SHARE}/location/nmea 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 @@ -115,6 +121,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 %defattr(-,location,location,-)