summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongdeok Suh <yduck.suh@samsung.com>2015-08-12 10:56:58 +0900
committerYeongdeok Suh <yduck.suh@samsung.com>2015-08-12 11:04:46 +0900
commitf458c6ca59626a9d941615e755ed923b0b8b20a3 (patch)
treeef1dad6a9c639b24a2ad914005a6b8f2051d5ab5
parent798f4d81d321051ac69dfcd7a877a06ba278c0a6 (diff)
downloadtoybox-accepted/tizen/mobile/20150812.110503.tar.gz
toybox-accepted/tizen/mobile/20150812.110503.tar.bz2
toybox-accepted/tizen/mobile/20150812.110503.zip
Change-Id: I102fa968d392e6b120f3f154d7fd816214d85998 Signed-off-by: Yeongdeok Suh <yduck.suh@samsung.com>
-rw-r--r--packaging/klogd.service1
-rw-r--r--packaging/syslogd.service1
-rw-r--r--packaging/toybox.spec18
3 files changed, 9 insertions, 11 deletions
diff --git a/packaging/klogd.service b/packaging/klogd.service
index d6cf657..03df845 100644
--- a/packaging/klogd.service
+++ b/packaging/klogd.service
@@ -11,7 +11,6 @@ ExecStart=/sbin/klogd
OOMScoreAdjust=-1000
Restart=always
RestartSec=0
-SmackProcessLabel=klogd
[Install]
WantedBy=basic.target
diff --git a/packaging/syslogd.service b/packaging/syslogd.service
index 24a75a6..7b10609 100644
--- a/packaging/syslogd.service
+++ b/packaging/syslogd.service
@@ -11,7 +11,6 @@ ExecStart=/sbin/syslogd -b 5 -B 99
OOMScoreAdjust=-1000
Restart=always
RestartSec=0
-SmackProcessLabel=syslogd
[Install]
WantedBy=basic.target
diff --git a/packaging/toybox.spec b/packaging/toybox.spec
index b286a59..24f2a5c 100644
--- a/packaging/toybox.spec
+++ b/packaging/toybox.spec
@@ -95,11 +95,11 @@ for f in `cat %SOURCE5` ; do ln -s ../../bin/toybox $f ; done
popd
# install systemd service files for syslogd and klogd
-mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
-install -m 644 %SOURCE101 %{buildroot}%{_libdir}/systemd/system/klogd.service
-ln -s ../klogd.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/klogd.service
-install -m 644 %SOURCE102 %{buildroot}%{_libdir}/systemd/system/syslogd.service
-ln -s ../syslogd.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/syslogd.service
+mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
+install -m 644 %SOURCE101 %{buildroot}%{_unitdir}/klogd.service
+ln -s ../klogd.service %{buildroot}%{_unitdir}/basic.target.wants/klogd.service
+install -m 644 %SOURCE102 %{buildroot}%{_unitdir}/syslogd.service
+ln -s ../syslogd.service %{buildroot}%{_unitdir}/basic.target.wants/syslogd.service
rm -rf $RPM_BUILD_ROOT/sbin/syslogd
cp -f $RPM_BUILD_ROOT/bin/toybox $RPM_BUILD_ROOT/sbin/syslogd
rm -rf $RPM_BUILD_ROOT/sbin/klogd
@@ -129,16 +129,16 @@ cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-dhcpd
%defattr(-,root,root,-)
%{_datadir}/license/toybox-symlinks-klogd
/sbin/klogd
-%{_libdir}/systemd/system/klogd.service
-%{_libdir}/systemd/system/basic.target.wants/klogd.service
+%{_unitdir}/klogd.service
+%{_unitdir}/basic.target.wants/klogd.service
%manifest klogd.manifest
%files symlinks-sysklogd
%defattr(-,root,root,-)
%{_datadir}/license/toybox-symlinks-sysklogd
/sbin/syslogd
-%{_libdir}/systemd/system/syslogd.service
-%{_libdir}/systemd/system/basic.target.wants/syslogd.service
+%{_unitdir}/syslogd.service
+%{_unitdir}/basic.target.wants/syslogd.service
%manifest syslogd.manifest
%files symlinks-dhcp