Remove legacy sysVinit scripts 07/31007/1
authorMikko Ylinen <mikko.ylinen@intel.com>
Fri, 28 Nov 2014 12:20:24 +0000 (14:20 +0200)
committerMikko Ylinen <mikko.ylinen@intel.com>
Fri, 28 Nov 2014 12:48:29 +0000 (14:48 +0200)
Change-Id: I063518bd2f6ac2af9741f47e54490e2e866a3966
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
Makefile.am
configure.ac
init/Makefile.am [deleted file]
init/mmfwaudio [deleted file]
init/soundserver [deleted file]
packaging/libmm-sound.spec

index 9c7e296..0714084 100644 (file)
@@ -4,8 +4,6 @@ SUBDIRS = common \
                server \
                testsuite
 
-SUBDIRS += init
-               
 lib_LTLIBRARIES = libmmfsound.la
 
 includelibmmfsounddir = $(includedir)/mmf
index 71968ac..01e5195 100644 (file)
@@ -138,6 +138,5 @@ pkgconfig/Makefile
 pkgconfig/mm-sound.pc
 pkgconfig/mm-keysound.pc
 testsuite/Makefile
-init/Makefile
 ])
 AC_OUTPUT
diff --git a/init/Makefile.am b/init/Makefile.am
deleted file mode 100644 (file)
index 504f7b4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-installinitscriptdir = /etc/rc.d/init.d
-installinitscript_SCRIPTS = $(srcdir)/soundserver
diff --git a/init/mmfwaudio b/init/mmfwaudio
deleted file mode 100755 (executable)
index 9ddc192..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides:          mmfwaudio
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: start sound_server daemon
-### END INIT INFO
-
-dlogutil -v threadtime -f /var/log/mmfw_audio.log -r 1000 -n 10 MMFW_AVAUDIO:W MMFW_SOUND MMFW_SESSIONMGR &
diff --git a/init/soundserver b/init/soundserver
deleted file mode 100755 (executable)
index d7b7884..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides:          soundserver
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: start sound_server daemon
-### END INIT INFO
-
-if [ -x /usr/bin/sound_server ]; then
-       /usr/bin/sound_server -S&
-fi
index 6f58c70..cde089f 100644 (file)
@@ -89,14 +89,6 @@ install -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/
 
 %install_service multi-user.target.wants sound-server.path
 
-# FIXME: remove after systemd is in
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d
-ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S23soundserver
-ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S23soundserver
-
-
 %post
 /sbin/ldconfig
 
@@ -128,9 +120,6 @@ ln -sf %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc
 %{_libdir}/soundplugins/libsoundplugintone.so
 %{_libdir}/soundplugins/libsoundpluginwave.so
 %{_libdir}/soundplugins/libsoundpluginkeytone.so
-%config %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/soundserver
-%config %{_sysconfdir}/rc.d/rc3.d/S23soundserver
-%config %{_sysconfdir}/rc.d/rc4.d/S23soundserver
 %{_prefix}/share/sounds/sound-server/*
 %{_unitdir}/multi-user.target.wants/sound-server.path
 %{_unitdir}/sound-server.service