Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-03 18:07:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

lm_sensor rebuild for new patch/udev move to /run

Browse Source
This commit is contained in:
abveritas 2011-06-14 22:33:38 +00:00
parent 886fb0546a
commit 0071a8c2b1
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lm_sensors/PKGBUILD
View File

@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=lm_sensors
pkgver=3.3.0
pkgrel=1
pkgrel=2
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
arch=('i686' 'x86_64')
url="http://www.lm-sensors.org/"
@ -21,7 +21,7 @@ options=('!emptydirs')
install=sensors.install
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \
sensord.conf sensord.rc daemonarg.patch)
sensord.conf sensord.rc daemonarg.patch changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff)
md5sums=('5eb18d7531ead4f54f28a1133a606535'
'c370f5e620bfe41113354a1e22c0c18c'
@ -32,7 +32,8 @@ md5sums=('5eb18d7531ead4f54f28a1133a606535'
'970408d2e509dc4138927020efefe323'
'96a8dd468e81d455ec9b165bdf33e0b7'
'41a5c20854bbff00ea7174bd2276b736'
'40c8eb16af8249a0f1d851fc1057ea15')
'40c8eb16af8249a0f1d851fc1057ea15'
'10bebd3b8ccf8303a950dc242e5c8faf')
sha1sums=('16c13a186557164fa51459a02209b120c0335f96'
'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
'a068ac0a3115a6191a487e11422506baa922b40a'
@ -42,12 +43,14 @@ sha1sums=('16c13a186557164fa51459a02209b120c0335f96'
'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f'
'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
'72a60251d1d55a67307dab4105d9f3f01a080af4'
'34241388c4001bfb6e49b7e10da1217e29a258d6')
'34241388c4001bfb6e49b7e10da1217e29a258d6'
'3fde31cbd3464e0e7bd6b3402b451dad04a8ac2b')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 < ../sensors-detect.patch
patch -p1 < ../daemonarg.patch
patch -p2 < ../changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff
make PREFIX=/usr
}

44
lm_sensors/changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff Normal file
View File

@ -0,0 +1,44 @@
Index: lm-sensors/trunk/prog/detect/sensors-detect
===================================================================
--- lm-sensors/trunk/prog/detect/sensors-detect (revision 5963)
+++ lm-sensors/trunk/prog/detect/sensors-detect (revision 5964)
@@ -2416,5 +2416,5 @@
# Try some known default udev db locations, just in case
if (-e '/dev/.udev.tdb' || -e '/dev/.udev'
- || -e '/dev/.udevdb') {
+ || -e '/dev/.udevdb' || -e '/run/udev') {
$use_udev = 1;
$dev_i2c = '/dev/i2c-';
@@ -6460,4 +6460,20 @@
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"
@@ -6513,7 +6497,9 @@
exit -1;
}
- if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
- -f "/var/lock/subsys/lm_sensors") {
+ if (-x "/bin/systemctl" && -f "/lib/systemd/system/lm_sensors.service") {
+ system("/bin/systemctl", "stop", "lm_sensors.service");
+ } elsif (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
+ -f "/var/lock/subsys/lm_sensors") {
system("/sbin/service", "lm_sensors", "stop");
}