commit: 5ebb458f1c774067e101e2e455bd7dac7df2ac05 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Feb 4 17:38:16 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 4 21:21:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ebb458f
sys-apps/lm_sensors: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3808 .../lm_sensors-3.3.1-sensors-detect-gentoo.patch | 129 --------------------- 1 file changed, 129 deletions(-) diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.3.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.3.1-sensors-detect-gentoo.patch deleted file mode 100644 index 58772f2..00000000 --- a/sys-apps/lm_sensors/files/lm_sensors-3.3.1-sensors-detect-gentoo.patch +++ /dev/null @@ -1,129 +0,0 @@ ---- lm_sensors-3.3.1/prog/detect/sensors-detect -+++ lm_sensors-3.3.1/prog/detect/sensors-detect -@@ -20,6 +20,9 @@ - # MA 02110-1301 USA. - # - -+# Gentoo specific modifications based on a patch from Rudo Thomas -+# <[email protected]> -+ - require 5.004; - - use strict; -@@ -6471,26 +6474,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'); -- $_ = <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 -@@ -6501,6 +6511,11 @@ - # 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"; -@@ -6509,6 +6524,10 @@ - - # For compatibility reasons, modules are also listed individually as variables - # MODULE_0, MODULE_1, MODULE_2, etc. -+# Please note that the numbers in MODULE_X must start at 0 and increase in -+# steps of 1. Any number that is missing will make the init script skip the -+# rest of the modules. Use MODULE_X_ARGS for arguments. -+# - # You should use BUS_MODULES and HWMON_MODULES instead if possible. - - EOT -@@ -6519,25 +6538,7 @@ - } - 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"); -@@ -6551,20 +6552,6 @@ - "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".
