diff options
| -rw-r--r-- | packaging/sysctl-tizen-override.conf | 1 | ||||
| -rw-r--r-- | packaging/systemd.spec | 15 |
2 files changed, 5 insertions, 11 deletions
diff --git a/packaging/sysctl-tizen-override.conf b/packaging/sysctl-tizen-override.conf deleted file mode 100644 index aadbf78d87..0000000000 --- a/packaging/sysctl-tizen-override.conf +++ /dev/null @@ -1 +0,0 @@ -net.core.default_qdisc = pfifo_fast diff --git a/packaging/systemd.spec b/packaging/systemd.spec index c09d585980..3d587086e0 100644 --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -61,10 +61,9 @@ Source3: test-runner.c Source4: wait-default-target.sh Source5: wait-delayed-target.sh Source6: org.tizen.system.conf -Source7: sysctl-tizen-override.conf -Source8: send-booting-done.c -Source9: wait-target-done.c -Source10: delayed-target-trigger.sh +Source7: send-booting-done.c +Source8: wait-target-done.c +Source9: delayed-target-trigger.sh Source1001: systemd.manifest BuildRequires: gperf BuildRequires: intltool >= 0.40.0 @@ -172,8 +171,8 @@ This modifies systemd to support KDBUS in Tizen. %build cp %{SOURCE1001} . cp %{SOURCE3} . +cp %{SOURCE7} . cp %{SOURCE8} . -cp %{SOURCE9} . %define _vpath_srcdir . %define _vpath_builddir %{build_dir} @@ -375,10 +374,7 @@ ln -sf ./libsystemd.pc %{buildroot}%{_libdir}/pkgconfig/libsystemd-login.pc install -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/wait-default-target.sh install -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/wait-delayed-target.sh install -m 0644 %{SOURCE6} %{buildroot}%{dbuspolicydir}/system.d/org.tizen.system.conf -install -m 0755 %{SOURCE10} %{buildroot}%{_bindir}/delayed-target-trigger.sh - -# Tizen sysctl values overriding default systemd values -install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysctl.d/ +install -m 0755 %{SOURCE9} %{buildroot}%{_bindir}/delayed-target-trigger.sh # end of install %pre @@ -547,7 +543,6 @@ fi %config(noreplace) %{_sysconfdir}/systemd/logind.conf %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/udev/udev.conf -%config(noreplace) %{_sysconfdir}/sysctl.d/sysctl-tizen-override.conf %config(noreplace) %{_sysconfdir}/systemd/sleep.conf %{_sysconfdir}/xdg/systemd %ghost %config(noreplace) %{_sysconfdir}/hostname |