From a7780f9b4eafffc2a8af23db820451edf59d19c7 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sun, 12 Aug 2018 01:28:02 +0000 Subject: [PATCH] 2018-08-11 Fred Gleason * Removed SysV-style init scripts. * Removed sysconfig support. --- ChangeLog | 3 +++ Makefile.am | 10 -------- install-init.sh | 36 -------------------------- rivendell.sys | 67 ------------------------------------------------- 4 files changed, 3 insertions(+), 113 deletions(-) delete mode 100755 install-init.sh delete mode 100644 rivendell.sys diff --git a/ChangeLog b/ChangeLog index a8bcc58a..42734b3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17367,3 +17367,6 @@ determining the current schema verion. 2018-08-11 Fred Gleason * Fixed regressions in 'RDFormPost' that broke audio importation. +2018-08-11 Fred Gleason + * Removed SysV-style init scripts. + * Removed sysconfig support. diff --git a/Makefile.am b/Makefile.am index cb27d672..a9a07092 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,19 +66,11 @@ ACLOCAL_AMFLAGS = -I m4 maintainer-clean-local: rm -rf m4 -install-exec-local: - ./install-init.sh $(DESTDIR)$(prefix) $(DESTDIR) - install-debian: touch ./building-debian make install rm -f ./building-debian -uninstall-exec: - rm -f $(DESTDIR)/etc/init.d/rdrepld - rm -f $(DESTDIR)/etc/init.d/rivendell - rm -f $(DESTDIR)/etc/sysconfig/rivendell - rpm: dist mkdir -p $(HOME)/rpmbuild/SOURCES cp rivendell-$(VERSION).tar.gz $(HOME)/rpmbuild/SOURCES/ @@ -118,7 +110,6 @@ EXTRA_DIST = autogen.sh\ CODINGSTYLE\ get_distro.pl\ get_target.sh\ - install-init.sh\ make_slack.in\ PACKAGE_VERSION\ rdrepld-suse.in\ @@ -126,7 +117,6 @@ EXTRA_DIST = autogen.sh\ rivendell.ism\ rivendell.pro\ rivendell.spec.in\ - rivendell.sys\ slack-desc.in\ slack_doinst.sh\ UPGRADING diff --git a/install-init.sh b/install-init.sh deleted file mode 100755 index 1fddedf2..00000000 --- a/install-init.sh +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/bash - -# install-init.sh -# -# Install the init scripts for Rivendell -# -# (C) Copyright 2005,2016 Fred Gleason -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -if test ! -f ./building-debian ; then - mkdir -p $2/etc/init.d - cp rivendell $2/etc/init.d/rivendell - cp rdrepld-suse $2/etc/init.d/rdrepld - mkdir -p $2/etc/sysconfig - cp rivendell.sys $2/etc/sysconfig/rivendell - mkdir -p $2/var/run/rivendell - if test -z $2 ; then - chmod 777 /var/run/rivendell - ldconfig - fi -fi - -# End of install-init.sh diff --git a/rivendell.sys b/rivendell.sys deleted file mode 100644 index e1476d57..00000000 --- a/rivendell.sys +++ /dev/null @@ -1,67 +0,0 @@ -## Path: Applications/Rivendell -## Description: Configure the Rivendell system daemons. - -## Type: yesno -## Default no -# -# Start the MeasurementComputing GPIO driver? -# -GPIO_START="no" - -## Type: yesno -## Default no -# -# Start the AudioScience HPI driver? -# -HPI_START="no" - -## Type: yesno -## Default no -# -# Start the Axia LiveWire driver? -# -LIVEWIRE_START="no" - -## Type: yesno -## Default no -# -# Start jackd? -# (NOTE: this option is here for backwards compatibity only! -# A much better method for controlling JACK is to set the 'JACK_START_SERVER' -# environmental variable and use '/etc/jackdrc' for configuration. See -# the jackd man page for details.) -# -JACK_START="no" - -## Type: integer -## Default 48000 -# -# Set the sample rate of the jackd daemon. -# (NOTE: this option is here for backwards compatibity only! -# A much better method for controlling JACK is to set the 'JACK_START_SERVER' -# environmental variable and use '/etc/jackdrc' for configuration. See -# the jackd man page for details.) -# -JACK_SAMPLE_RATE="48000" - -## Type: string -## Default hw:0 -# -# Set the ALSA device for the jackd daemon to use. -# (NOTE: this option is here for backwards compatibity only! -# A much better method for controlling JACK is to set the 'JACK_START_SERVER' -# environmental variable and use '/etc/jackdrc' for configuration. See -# the jackd man page for details.) -# -JACK_ALSA_DEVICE="hw:0" - -## Type: yesno -## Default no -# -# Use realtime scheduling for audio threads. -# (NOTE: this option is here for backwards compatibity only! -# A much better method for controlling JACK is to set the 'JACK_START_SERVER' -# environmental variable and use '/etc/jackdrc' for configuration. See -# the jackd man page for details.) -# -JACK_USE_REALTIME="no"