diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-21 15:36:52 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-21 15:38:17 +0200 |
| commit | 37c2ebe2c596846033254928cee8cadd4b6709c6 (patch) | |
| tree | 4912268b6968c7f4a99a97fe56512304ee39732b /main/lm_sensors | |
| parent | 7dfd2f35971a282b7b6811097311318bcc63f27b (diff) | |
| download | aports-37c2ebe2c596846033254928cee8cadd4b6709c6.tar.bz2 aports-37c2ebe2c596846033254928cee8cadd4b6709c6.tar.xz | |
main/lm_sensors: fix sensors-detect
make it generate /etc/modules-load.d/lm_sensors.conf
fixes #4186
Diffstat (limited to 'main/lm_sensors')
| -rw-r--r-- | main/lm_sensors/APKBUILD | 8 | ||||
| -rw-r--r-- | main/lm_sensors/sensors-detect-alpine.patch | 38 |
2 files changed, 27 insertions, 19 deletions
diff --git a/main/lm_sensors/APKBUILD b/main/lm_sensors/APKBUILD index 62ddff6da9..0f166b9d6e 100644 --- a/main/lm_sensors/APKBUILD +++ b/main/lm_sensors/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lm_sensors pkgver=3.3.5 -pkgrel=3 +pkgrel=4 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." url="http://www.lm-sensors.org/" arch="all" @@ -75,21 +75,21 @@ sensord() { } md5sums="da506dedceb41822e64865f6ba34828a lm_sensors-3.3.5.tar.bz2 -e507d7c34067c03602dd652f31f14f2f sensors-detect-alpine.patch +8e508dcb4e35c2b05154ea0efae08a19 sensors-detect-alpine.patch 9411b5410420df8251c6e6c9c958fd89 musl-fix-includes.patch a0d35e054e9b0abb286c71f2212515f7 fancontrol.initd d117f84fddb226ac877489904d2187ab lm_sensors.initd 82e075236a61334abb3adf46280380d3 sensord.confd 8e4b68b7cf6d3f29a320af2dc2f5c1eb sensord.initd" sha256sums="5dae6a665e1150159a93743c4ff1943a7efe02cd9d3bb12c4805e7d7adcf4fcf lm_sensors-3.3.5.tar.bz2 -98fb317cca4650be2a842e28a36f8d69d7642d9f61cdf585eedc8cb93e7bfbf1 sensors-detect-alpine.patch +8a18ea7ebea7b85f8ef518adba4445f08002b5a749b74bae174fc6496c818b5b sensors-detect-alpine.patch e9bf572221a262bb53cefc86bea4d3d957a1e7962e6b3c0c2917fb3945bb7545 musl-fix-includes.patch 1b108ed9e856bd1defdfe94ee6d299c50cc09bac1b70f865d83542ac7ae7c98c fancontrol.initd ad1dfb045caab9092da546f2c7443a5bb1817441cefa6c915a21c8346a1590bb lm_sensors.initd 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d sensord.confd 756ca3a1e138d10dd73246df3c3ff174330f351e7c4ca15e4bf888a0e3bb162a sensord.initd" sha512sums="0874084c3dd40b93ed05e1955f76e35e78ac3ac2343341d8ab5412fd941ea300b3a4b1320bec3a5bfb07309e82f42cc5dac0a728cdfddac4053d4fdb96dc12e7 lm_sensors-3.3.5.tar.bz2 -fc178b1019c0ec7c53758be471f5ae01294fd04dd93a5ba9453fc3ba23e38102711b042a09509394afe9e17167e55d210ae80af7b5a88ecb8af82e81d4dcafe5 sensors-detect-alpine.patch +794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb sensors-detect-alpine.patch 333751cb580c94f2d32ef5520d2f2acc0ef7e1cd4a6390ea75cae4c755fbdfcade1805c979ba3319905f1267bdc120a6746e6f70d89e0c72a8c2faefd34a9e79 musl-fix-includes.patch 04756c3844033dc7897e1348181140a43f8470c1bb863f1524b21bbe6be2f13fbf17ac3a68270c96a70d8c148124fea569d1ef75619bbe383e15ec705ea18b21 fancontrol.initd fc7a05e256da4d6f9bdf65c6d4dc1666c4bee141cfaa452d201443cd7287f1ac915a4b009b625ce0f85004f68e8e49fa92ac6650e63be56dacde17b8b43f9615 lm_sensors.initd diff --git a/main/lm_sensors/sensors-detect-alpine.patch b/main/lm_sensors/sensors-detect-alpine.patch index 1d5b2b2eb1..319fcec069 100644 --- a/main/lm_sensors/sensors-detect-alpine.patch +++ b/main/lm_sensors/sensors-detect-alpine.patch @@ -1,7 +1,8 @@ -diff -ru lm_sensors-3.1.0.orig/prog/detect/sensors-detect lm_sensors-3.1.0/prog/detect/sensors-detect ---- lm_sensors-3.1.0.orig/prog/detect/sensors-detect 2009-04-14 07:14:22.000000000 +0000 -+++ lm_sensors-3.1.0/prog/detect/sensors-detect 2009-04-14 07:44:48.000000000 +0000 -@@ -5282,19 +5282,24 @@ +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index 08721f0..6e83e97 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -7059,31 +7059,20 @@ sub write_config } } @@ -9,7 +10,7 @@ diff -ru lm_sensors-3.1.0.orig/prog/detect/sensors-detect lm_sensors-3.1.0/prog/ - printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", - (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), - ($have_sysconfig ? 'YES/no' : 'yes/NO'); -+ my $config = '/etc/conf.d/lm_sensors'; ++ my $config = '/etc/modules-load.d/lm_sensors.conf'; + my $have_config = -f $config; + printf "Do you want to \%s \%s? (\%s): ", + (-e $config ? 'overwrite' : 'generate'), @@ -27,13 +28,20 @@ diff -ru lm_sensors-3.1.0.orig/prog/detect/sensors-detect lm_sensors-3.1.0/prog/ + open(local *SYSCONFIG, ">$config") + or die "Sorry, can't create $config ($!)"; print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; -+ print SYSCONFIG -+ "\n". -+ "# Load modules at startup\n". -+ "LOADMODULES=yes\n\n". -+ "# Initialize sensors at startup\n". -+ "INITSENSORS=yes\n\n"; -+ - print SYSCONFIG <<'EOT'; - # This file is sourced by /etc/init.d/lm_sensors and defines the modules to - # be loaded/unloaded. +- print SYSCONFIG <<'EOT'; +-# This file is sourced by /etc/init.d/lm_sensors and defines the modules to +-# be loaded/unloaded. +-# +-# The format of this file is a shell script that simply defines variables: +-# HWMON_MODULES for hardware monitoring driver modules, and optionally +-# BUS_MODULES for any required bus driver module (for example for I2C or SPI). +- +-EOT +- print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n" ++ print SYSCONFIG join("\n", @{$bus_modules}), "\n" + if @{$bus_modules}; +- print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n"; ++ print SYSCONFIG join("\n", @{$hwmon_modules}), "\n"; + close(SYSCONFIG); + + if (-x "/bin/systemctl" && -d "/lib/systemd/system" && |