353fd02a0f
* Mostly a packaging-only clean-up, as we had backported most
important changes already.
* lm_sensors-r6111-detection-Winbond-W83627SF.diff,
lm_sensors-r6112-detection-AMD-family-16h.diff,
lm_sensors-r6113-ITE-IT877x-IT878x-driver.diff,
lm_sensors-r6117-detection-ITE-IT8752F.diff,
lm_sensors-r6123-AnalogDev-ADT7410-driver.diff,
lm_sensors-r6163-pwmconfig-raise-threshold.diff,
lm_sensors-r6164-pwmconfig-drop-comment.diff,
lm_sensors-r6165-pwmconfig-multiple-fans.diff,
lm_sensors-r6172-fancontrol-absolute-paths.diff: Removed,
upstream now.
* fancontrol.service: Removed, now provided by upstream,
together with sensord.service.
* lm_sensors-3.0.0-sysconfig_metadata.patch,
lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.
- lm_sensors-r6181-fix-service-files.patch: Fix EnvironmentFile
in service files
OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=63
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
Now that the kernel package is split into 3 parts, it is possible
|
|
that not all required hwmon drivers are installed on the system when
|
|
sensors-detect is being run. Point the user to the kernel-*-extra
|
|
package if drivers are found to be missing.
|
|
---
|
|
prog/detect/sensors-detect | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
--- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
|
|
+++ lm_sensors-3.3.2/prog/detect/sensors-detect
|
|
@@ -2616,12 +2616,15 @@ sub initialize_conf
|
|
# [2] -> SUBLEVEL
|
|
# [3] -> EXTRAVERSION
|
|
#
|
|
-use vars qw(@kernel_version $kernel_arch);
|
|
+use vars qw(@kernel_version $kernel_flavor $kernel_arch);
|
|
|
|
sub initialize_kernel_version
|
|
{
|
|
`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
|
|
@kernel_version = ($1, $2, $3, $4);
|
|
+ if ($kernel_version[3] =~ /-([a-z]+)$/) {
|
|
+ chomp($kernel_flavor = $1);
|
|
+ }
|
|
chomp($kernel_arch = `uname -m`);
|
|
|
|
# We only support kernels >= 2.6.5
|
|
@@ -6635,7 +6638,11 @@ sub generate_modprobes
|
|
# isn't supported
|
|
if ((($? >> 8) == 0) && ! $modulefound) {
|
|
print "Warning: the required module $driver is not currently installed\n".
|
|
- "on your system. If it is built into the kernel then it's OK.\n".
|
|
+ "on your system. ".
|
|
+ ($kernel_flavor ?
|
|
+ "You may need to install package\n".
|
|
+ "kernel-$kernel_flavor-extra for lm-sensors to work properly.\n" :
|
|
+ "If it is built into the kernel then it's OK.\n").
|
|
"Otherwise, check http://www.lm-sensors.org/wiki/Devices for\n".
|
|
"driver availability.\n\n";
|
|
} else {
|