summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2017-10-03 16:21:10 +0200
committerThomas Deutschmann <whissi@gentoo.org>2017-10-03 16:25:25 +0200
commitd8e0141971af134a48401d57761019e151f7553f (patch)
tree93141bbbf5a8c9dcb806c5a0508e64378041d807 /sys-apps/lm_sensors/files
parentdev-util/jenkins-bin: Bump (diff)
downloadgentoo-d8e0141971af134a48401d57761019e151f7553f.tar.gz
gentoo-d8e0141971af134a48401d57761019e151f7553f.tar.bz2
gentoo-d8e0141971af134a48401d57761019e151f7553f.zip
sys-apps/lm_sensors: Cleanup old
See: https://github.com/gentoo/gentoo/pull/5847 Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'sys-apps/lm_sensors/files')
-rw-r--r--sys-apps/lm_sensors/files/fancontrol-init.d-222
-rw-r--r--sys-apps/lm_sensors/files/fancontrol.service9
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3-init.d104
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch118
-rw-r--r--sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch120
-rw-r--r--sys-apps/lm_sensors/files/sensord-4-init.d21
-rw-r--r--sys-apps/lm_sensors/files/sensord-conf.d3
-rw-r--r--sys-apps/lm_sensors/files/sensord.service9
8 files changed, 0 insertions, 406 deletions
diff --git a/sys-apps/lm_sensors/files/fancontrol-init.d-2 b/sys-apps/lm_sensors/files/fancontrol-init.d-2
deleted file mode 100644
index ea60db78370..00000000000
--- a/sys-apps/lm_sensors/files/fancontrol-init.d-2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONFIG=/etc/fancontrol
-
-depend() {
- need localmount
- use lm_sensors
-}
-
-command=/usr/sbin/fancontrol
-command_arguments="${CONFIG}"
-start_stop_daemon_args="--background"
-pidfile=/var/run/fancontrol.pid
-
-start_pre() {
- if [ ! -f ${CONFIG} ]; then
- eerror "Configuration file ${CONFIG} not found"
- return 1
- fi
-}
diff --git a/sys-apps/lm_sensors/files/fancontrol.service b/sys-apps/lm_sensors/files/fancontrol.service
deleted file mode 100644
index c86b498f830..00000000000
--- a/sys-apps/lm_sensors/files/fancontrol.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3-init.d b/sys-apps/lm_sensors/files/lm_sensors-3-init.d
deleted file mode 100644
index 461d1ede93e..00000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3-init.d
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-checkconfig() {
- if [ ! -f /etc/conf.d/lm_sensors ]; then
- eerror "/etc/conf.d/lm_sensors does not exist, try running sensors-detect"
- return 1
- fi
-
- if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
- if [ -z "${MODULE_0}" ]; then
- eerror "MODULE_0 is not set in /etc/conf.d/lm_sensors, try running sensors-detect"
- return 1
- fi
- fi
-}
-
-start() {
- checkconfig || return 1
-
- if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
- einfo "Loading lm_sensors modules..."
-
- mount | grep sysfs >/dev/null 2>&1
- if [ ${?} = 0 ]; then
- if ! ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ); then
- ebegin " Loading i2c-core"
- modprobe i2c-core >/dev/null 2>&1
- if [ ${?} != 0 ]; then
- eerror " Could not load i2c-core!"
- eend 1
- fi
- ( [ -e /sys/i2c ] || [ -e /sys/bus/i2c ] ) || return 1
- eend 0
- fi
- elif ! [ -e /proc/sys/dev/sensors ]; then
- ebegin " Loading i2c-proc"
- modprobe i2c-proc >/dev/null 2>&1
- if [ ${?} != 0 ]; then
- eerror " Could not load i2c-proc!"
- eend 1
- fi
- [ -e /proc/sys/dev/sensors ] || return 1
- eend 0
- fi
-
- i=0
- while true; do
- module=`eval echo '$'MODULE_${i}`
- module_args=`eval echo '$'MODULE_${i}_ARGS`
- if [ -z "${module}" ]; then
- break
- fi
- ebegin " Loading ${module}"
- modprobe ${module} ${module_args} >/dev/null 2>&1
- eend $?
- i=$(($i+1))
- done
- fi
-
- if [ "${INITSENSORS}" = "yes" ]; then
- if ! [ -f /etc/sensors3.conf ]; then
- eerror "/etc/sensors3.conf does not exist!"
- return 1
- fi
-
- ebegin "Initializing sensors"
- /usr/bin/sensors -s >/dev/null 2>&1
- eend ${?}
- fi
-}
-
-stop() {
- checkconfig || return 1
-
- if [ "${LOADMODULES}" = "yes" -a -f /proc/modules ]; then
- einfo "Unloading lm_sensors modules..."
-
- # find the highest possible MODULE_ number
- i=0
- while true; do
- module=`eval echo '$'MODULE_${i}`
- if [ -z "${module}" ] ; then
- break
- fi
- i=$(($i+1))
- done
-
- while [ ${i} -gt 0 ]; do
- i=$(($i-1))
- module=`eval echo '$'MODULE_${i}`
- ebegin " Unloading ${module}"
- rmmod ${module} >/dev/null 2>&1
- eend $?
- done
-
- if [ -e /proc/sys/dev/sensors ] ; then
- ebegin " Unloading i2c-proc"
- rmmod i2c-proc >/dev/null 2>&1
- eend $?
- fi
- fi
-}
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch
deleted file mode 100644
index 215969af2cb..00000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.3.4-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
-index fb17481..bb324c2 100755
---- a/prog/detect/sensors-detect
-+++ b/prog/detect/sensors-detect
-@@ -20,6 +20,9 @@
- # MA 02110-1301 USA.
- #
-
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+# <thomr9am@ss1000.ms.mff.cuni.cz>
-+
- require 5.004;
-
- use strict;
-@@ -6671,26 +6674,33 @@ sub write_config
- print MODPROBE_D $configfile;
- close(MODPROBE_D);
- } else {
-+ print "\nIf you want to load the modules at startup, generate a config file\n",
-+ "below and make sure lm_sensors gets started at boot time; e.g\n",
-+ "\$ rc-update add lm_sensors default\n";
- print "To make the sensors modules behave correctly, add these lines to\n".
-- "/etc/modprobe.conf:\n\n";
-+ "/etc/modules.d/lm_sensors and run modules-update:\n\n";
- print "#----cut here----\n".
- $configfile.
- "#----cut here----\n\n";
- }
- }
-
-- my $have_sysconfig = -d '/etc/sysconfig';
-- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
-- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-- ($have_sysconfig ? 'YES/no' : 'yes/NO');
-- $_ = <STDIN>;
-- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
-- unless ($have_sysconfig) {
-- mkdir('/etc/sysconfig', 0777)
-- or die "Sorry, can't create /etc/sysconfig ($!)";
-+ my $have_config = -f '/etc/conf.d/lm_sensors';
-+ print "\nDo you want to ".($have_config?"overwrite":"generate").
-+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
-+ " (".($have_config?"yes/NO":"YES/no")."/s): ";
-+ my $reply = <STDIN>;
-+
-+ if (($have_config and $reply =~ /^\s*[Yy]/) or
-+ (not $have_config and not $reply =~ /^\s*[Nn]/) or
-+ $reply =~ /^\s*[Ss]/) {
-+ my $filename = "/etc/conf.d/lm_sensors";
-+ if ($reply =~ /^\s*[Ss]/) {
-+ print "Specify the file to store the configuration to: ";
-+ $filename = <STDIN>;
- }
-- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
-- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+ open(local *SYSCONFIG, ">".$filename)
-+ or die "Sorry, can't create $filename ($!).";
- print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- print SYSCONFIG <<'EOT';
- # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-@@ -6701,30 +6711,17 @@ sub write_config
- # BUS_MODULES for any required bus driver module (for example for I2C or SPI).
-
- EOT
-+ print SYSCONFIG
-+ "# Load modules at startup\n".
-+ "LOADMODULES=yes\n\n".
-+ "# Initialize sensors at startup\n".
-+ "INITSENSORS=yes\n\n";
- print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
- if @{$bus_modules};
- print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
- close(SYSCONFIG);
-
-- if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
-- ! -f "/lib/systemd/system/lm_sensors.service") {
-- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
-- "and run 'systemctl enable lm_sensors.service'\n".
-- "for initialization at boot time.\n";
-- return;
-- }
--
-- if (-x "/bin/systemctl" &&
-- -f "/lib/systemd/system/lm_sensors.service") {
-- system("/bin/systemctl", "enable", "lm_sensors.service");
-- system("/bin/systemctl", "start", "lm_sensors.service");
-- # All done, don't check for /etc/init.d/lm_sensors
-- return;
-- }
--
-- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-- "for initialization at boot time.\n"
-- unless -f "/etc/init.d/lm_sensors";
-+ print "Done.\n";
-
- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
- system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -6738,20 +6735,6 @@ EOT
- "kernel modules.\n\n";
- }
- } else {
-- print "To load everything that is needed, add this to one of the system\n".
-- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-- print "#----cut here----\n";
-- if (@{$bus_modules}) {
-- print "# Adapter drivers\n";
-- print "modprobe $_\n" foreach (@{$bus_modules});
-- }
-- print "# Chip drivers\n";
-- print "modprobe $_\n" foreach (@{$hwmon_modules});
-- print((-e '/usr/bin/sensors' ?
-- "/usr/bin/sensors -s\n" :
-- "/usr/local/bin/sensors -s\n").
-- "#----cut here----\n\n");
--
- print "If you have some drivers built into your kernel, the list above will\n".
- "contain too many modules. Skip the appropriate ones! You really\n".
- "should try these commands right now to make sure everything is\n".
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch
deleted file mode 100644
index 0ea9a02b3f9..00000000000
--- a/sys-apps/lm_sensors/files/lm_sensors-3.3.5-sensors-detect-gentoo.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- lm_sensors-3.3.5/prog/detect/sensors-detect
-+++ lm_sensors-3.3.5/prog/detect/sensors-detect
-@@ -20,6 +20,9 @@
- # MA 02110-1301 USA.
- #
-
-+# Gentoo specific modifications based on a patch from Rudo Thomas
-+# <thomr9am@ss1000.ms.mff.cuni.cz>
-+
- require 5.004;
-
- use strict;
-@@ -6762,26 +6765,33 @@
- print MODPROBE_D $configfile;
- close(MODPROBE_D);
- } else {
-+ print "\nIf you want to load the modules at startup, generate a config file\n",
-+ "below and make sure lm_sensors gets started at boot time; e.g\n",
-+ "\$ rc-update add lm_sensors default\n";
- print "To make the sensors modules behave correctly, add these lines to\n".
-- "/etc/modprobe.conf:\n\n";
-+ "/etc/modules.d/lm_sensors and run modules-update:\n\n";
- print "#----cut here----\n".
- $configfile.
- "#----cut here----\n\n";
- }
- }
-
-- my $have_sysconfig = -d '/etc/sysconfig';
-- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
-- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-- ($have_sysconfig ? 'YES/no' : 'yes/NO');
-- $_ = read_answer();
-- if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
-- unless ($have_sysconfig) {
-- mkdir('/etc/sysconfig', 0777)
-- or die "Sorry, can't create /etc/sysconfig ($!)";
-+ my $have_sysconfig = -f '/etc/conf.d/lm_sensors';
-+ printf "Do you want to ".($have_sysconfig?"overwrite":"generate").
-+ " /etc/conf.d/lm_sensors? Enter s to specify other file name?\n",
-+ " (".($have_sysconfig?"yes/NO":"YES/no")."/s): ";
-+ my $reply = read_answer();
-+
-+ if (($have_sysconfig and $reply =~ /^\s*[Yy]/) or
-+ (not $have_sysconfig and not $reply =~ /^\s*[Nn]/) or
-+ $reply =~ /^\s*[Ss]/) {
-+ my $filename = "/etc/conf.d/lm_sensors";
-+ if ($reply =~ /^\s*[Ss]/) {
-+ print "Specify the file to store the configuration to: ";
-+ $filename = read_answer();
- }
-- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
-- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+ open(local *SYSCONFIG, ">".$filename)
-+ or die "Sorry, can't create $filename ($!).";
- print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
- print SYSCONFIG <<'EOT';
- # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
-@@ -6792,30 +6802,17 @@
- # BUS_MODULES for any required bus driver module (for example for I2C or SPI).
-
- EOT
-+ print SYSCONFIG
-+ "# Load modules at startup\n".
-+ "LOADMODULES=yes\n\n".
-+ "# Initialize sensors at startup\n".
-+ "INITSENSORS=yes\n\n";
- print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
- if @{$bus_modules};
- print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
- close(SYSCONFIG);
-
-- if (-x "/bin/systemctl" && -d "/lib/systemd/system" &&
-- ! -f "/lib/systemd/system/lm_sensors.service") {
-- print "Copy prog/init/lm_sensors.service to /lib/systemd/system\n".
-- "and run 'systemctl enable lm_sensors.service'\n".
-- "for initialization at boot time.\n";
-- return;
-- }
--
-- if (-x "/bin/systemctl" &&
-- -f "/lib/systemd/system/lm_sensors.service") {
-- system("/bin/systemctl", "enable", "lm_sensors.service");
-- system("/bin/systemctl", "start", "lm_sensors.service");
-- # All done, don't check for /etc/init.d/lm_sensors
-- return;
-- }
--
-- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-- "for initialization at boot time.\n"
-- unless -f "/etc/init.d/lm_sensors";
-+ print "Done.\n";
-
- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
- system("/sbin/insserv", "/etc/init.d/lm_sensors");
-@@ -6828,24 +6825,6 @@
- print "You should now start the lm_sensors service to load the required\n".
- "kernel modules.\n\n";
- }
-- } else {
-- print "To load everything that is needed, add this to one of the system\n".
-- "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
-- print "#----cut here----\n";
-- if (@{$bus_modules}) {
-- print "# Adapter drivers\n";
-- print "modprobe $_\n" foreach (@{$bus_modules});
-- }
-- print "# Chip drivers\n";
-- print "modprobe $_\n" foreach (@{$hwmon_modules});
-- print((-e '/usr/bin/sensors' ?
-- "/usr/bin/sensors -s\n" :
-- "/usr/local/bin/sensors -s\n").
-- "#----cut here----\n\n");
--
-- print "You really should try these commands right now to make sure everything\n".
-- "is working properly. Monitoring programs won't work until the needed\n".
-- "modules are loaded.\n\n";
- }
- }
-
diff --git a/sys-apps/lm_sensors/files/sensord-4-init.d b/sys-apps/lm_sensors/files/sensord-4-init.d
deleted file mode 100644
index beaecbfabf7..00000000000
--- a/sys-apps/lm_sensors/files/sensord-4-init.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CONFIG=/etc/sensors3.conf
-
-depend() {
- need localmount
- use logger lm_sensors
-}
-
-pidfile=/run/sensord.pid
-command=/usr/sbin/sensord
-command_args="--config-file ${CONFIG} ${SENSORD_OPTIONS} --pid-file ${pidfile}"
-
-start_pre() {
- if [ ! -f ${CONFIG} ]; then
- eerror "Configuration file ${CONFIG} not found"
- return 1
- fi
-}
diff --git a/sys-apps/lm_sensors/files/sensord-conf.d b/sys-apps/lm_sensors/files/sensord-conf.d
deleted file mode 100644
index d82841aebd4..00000000000
--- a/sys-apps/lm_sensors/files/sensord-conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-# Extra options to pass to the sensord daemon,
-# see sensord(8) for more information
-SENSORD_OPTIONS=""
diff --git a/sys-apps/lm_sensors/files/sensord.service b/sys-apps/lm_sensors/files/sensord.service
deleted file mode 100644
index 6d272f1efd1..00000000000
--- a/sys-apps/lm_sensors/files/sensord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
-
-[Install]
-WantedBy=multi-user.target