From d7edbc83abecc68ab67afa02c23062cdd447ee8e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 22 May 2008 17:00:49 +0000 Subject: Adding a new version of lm_sensors for testing, as I don't yet want to move to the 3.0 series. svn path=/; revision=181 --- sys-apps/lm_sensors/Manifest | 11 ++ sys-apps/lm_sensors/files/fancontrol-init.d | 33 +++++ .../lm_sensors-2.10.4-sensors-detect-gentoo.patch | 111 ++++++++++++++++ sys-apps/lm_sensors/files/lm_sensors-3-init.d | 105 +++++++++++++++ .../lm_sensors-3.0.1-sensors-detect-gentoo.patch | 116 ++++++++++++++++ sys-apps/lm_sensors/files/lm_sensors-init.d | 105 +++++++++++++++ sys-apps/lm_sensors/files/sensord-conf.d | 3 + sys-apps/lm_sensors/files/sensord-init.d | 33 +++++ sys-apps/lm_sensors/lm_sensors-2.10.6.ebuild | 148 +++++++++++++++++++++ sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild | 117 ++++++++++++++++ 10 files changed, 782 insertions(+) create mode 100644 sys-apps/lm_sensors/Manifest create mode 100644 sys-apps/lm_sensors/files/fancontrol-init.d create mode 100644 sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch create mode 100644 sys-apps/lm_sensors/files/lm_sensors-3-init.d create mode 100644 sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch create mode 100644 sys-apps/lm_sensors/files/lm_sensors-init.d create mode 100644 sys-apps/lm_sensors/files/sensord-conf.d create mode 100644 sys-apps/lm_sensors/files/sensord-init.d create mode 100644 sys-apps/lm_sensors/lm_sensors-2.10.6.ebuild create mode 100644 sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest new file mode 100644 index 0000000..9ef6eb1 --- /dev/null +++ b/sys-apps/lm_sensors/Manifest @@ -0,0 +1,11 @@ +AUX fancontrol-init.d 726 RMD160 444eedc0044a61e0a79d79565e6399156b8f9b9c SHA1 aabcdaf530f6d49f3de01e9b6d78470c6538ff38 SHA256 b231b76d5b32bb303a8e42727f48a4405cec71eedfe392e837acba5e46532783 +AUX lm_sensors-2.10.4-sensors-detect-gentoo.patch 4350 RMD160 962c2ddcd5b59926d2ccaa0ba0b65bd05d758d45 SHA1 3ba0c151f1dbecfed52444561c73897902270574 SHA256 1ace0bb0f88c0f6f235ca47317fddf723d4e8900f9ba66aae432b44274ca192b +AUX lm_sensors-3-init.d 2466 RMD160 54b58e00914e9c1f8b21e6a73cc215335d9dd647 SHA1 6250e4e28cd936efa6d05846b16175e85fe821c5 SHA256 9b018f9f7a0975988387858823fe59a5cd8af6413d8c3170db0e24aac6021ec3 +AUX lm_sensors-3.0.1-sensors-detect-gentoo.patch 4708 RMD160 bebfd29cbb5ec39efc78e140ebd4115291ecd632 SHA1 3dd7635f0e126c54aa3ccc90b8e33977d85fc0d0 SHA256 bcaee3c4b9001339222445a7c5ea328c5fff379c969bde3cfe382266cf4f4824 +AUX lm_sensors-init.d 2457 RMD160 5e7c90dc926e5df4426e3ab3f42f3d61dd4c7696 SHA1 b2fdb2d08da3491f4128714bb7ba6006420dcc07 SHA256 2271f55d96946ee15d907715ec59d55724a0bb9f81e1b25beef399bc18579b4a +AUX sensord-conf.d 104 RMD160 c4a06a8492d6c0fd966dea64d92f798a9b716a92 SHA1 43090c58c918969caa359d3b6e89237585759f46 SHA256 02230edf5efbb0a4de3840cd76f9ebf431c57a246fa7388e9dbeb0fe26fe7b8d +AUX sensord-init.d 708 RMD160 31e5a4ac844333bc9689346bb68c206ded13f1a3 SHA1 45dd30ba6d158022e8290ea9b09fd2a1053c5b58 SHA256 9f6d0e7bcdc1b4b3bc0835b40f246f7caf76e1b3bbfcf76a5d5b235eb8243d89 +DIST lm_sensors-2.10.6.tar.gz 934006 RMD160 b35f540ca42fdaf4dc7f28792f349fe5573cd64b SHA1 e9507fd6d77bc464d1ae8aef78b48ead85f13368 SHA256 90d038fd9a353786b497b97235e8202396b39a9163bbb9bebebe6c81d9d8dee5 +DIST lm_sensors-3.0.1.tar.bz2 186183 RMD160 2af36278eef69b55495c336343e4e7fd8e6fa86d SHA1 1862d3cce07e4cbb7d2e7da9e89f72929273bfec SHA256 f47f7e46f604054ec32b899a04d3d450a37de533e962c763c5d7068b31b9bc23 +EBUILD lm_sensors-2.10.6.ebuild 4488 RMD160 d485ec363ea45cba097a69e73f2c75c463c5c57a SHA1 057536b45a6f445b701926caae0f86da3cfa5f58 SHA256 8f00835486dd960f27e55e9e6ba2e266c02d5d4ffe971e8bacade1a62db61f6d +EBUILD lm_sensors-3.0.1.ebuild 3145 RMD160 cd306bf0f44466035aaea0a49ed713126805db7b SHA1 49e069ab1b166c4fce6b923ec5240cfd309b0551 SHA256 f4b62ef3ce55721e3ee786d9af0a9fa0a00e818272471f48de1fdb70079be748 diff --git a/sys-apps/lm_sensors/files/fancontrol-init.d b/sys-apps/lm_sensors/files/fancontrol-init.d new file mode 100644 index 0000000..fb163ab --- /dev/null +++ b/sys-apps/lm_sensors/files/fancontrol-init.d @@ -0,0 +1,33 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/fancontrol-init.d,v 1.1 2007/05/17 07:31:41 phreak Exp $ + +CONFIG=/etc/fancontrol +PID=/var/run/fancontrol.pid + +depend() { + after lm_sensors +} + +checkconfig() { + if [ ! -f ${CONFIG} ]; then + eerror "Configuration file ${CONFIG} not found" + return 1 + fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting fancontrol" + start-stop-daemon --start --quiet --background --pidfile ${PID} \ + --exec /usr/sbin/fancontrol -- ${CONFIG} + eend ${?} +} + +stop() { + ebegin "Stopping fancontrol" + start-stop-daemon --stop --pidfile ${PID} + eend ${?} +} diff --git a/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch new file mode 100644 index 0000000..00b76b9 --- /dev/null +++ b/sys-apps/lm_sensors/files/lm_sensors-2.10.4-sensors-detect-gentoo.patch @@ -0,0 +1,111 @@ +diff -ur lm_sensors-2.10.4.orig/prog/detect/sensors-detect lm_sensors-2.10.4/prog/detect/sensors-detect +--- lm_sensors-2.10.4.orig/prog/detect/sensors-detect 2007-07-31 00:41:52.000000000 +0200 ++++ lm_sensors-2.10.4/prog/detect/sensors-detect 2007-07-31 00:45:12.000000000 +0200 +@@ -27,6 +27,9 @@ + # each be put in a separate file, using modules and packages. That is beyond + # me. + ++# Gentoo specific modifications based on a patch from Rudo Thomas ++# ++ + require 5.004; + + use strict; +@@ -5708,8 +5711,11 @@ + + print "\n"; + my ($modprobes, $configfile) = generate_modprobes 1; # 1 == prefer ISA ++ 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". +- "$modules_conf:\n\n"; ++ "/etc/modules.d/lm_sensors and run modules-update:\n\n"; + print "#----cut here----\n". + $configfile. + "#----cut here----\n\n"; +@@ -5728,22 +5734,33 @@ + "should try these commands right now to make sure everything is\n". + "working properly. Monitoring programs won't work until the needed\n". + "modules are loaded.\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'); +- $_ = ; +- 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 ($!)"; +- } +- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") +- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; +- print SYSCONFIG <<'EOT'; +-# /etc/sysconfig/lm_sensors - Defines modules loaded by +-# /etc/init.d/lm_sensors ++ ++ print "To load everything that is needed, execute the commands below..."; ++ ++ print "\n\n#----cut here----\n"; ++ print $modprobes; ++ print "# sleep 2 # optional\n", ++ "/usr/bin/sensors -s # recommended\n"; ++ print "#----end cut here----\n"; ++ ++ 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 = ; ++ ++ 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 = ; ++ } ++ open(SYSCONFIG, ">".$filename) ++ or die "Sorry, can't create $filename ($!)."; ++ print SYSCONFIG <<'EOT'; ++# /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors + # Copyright (c) 1998 - 2001 Frodo Looijaard + # + # This program is free software; you can redistribute it and/or modify +@@ -5771,12 +5788,21 @@ + # in order as normal variables with the special names: + # 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. ++# + # List the modules that are to be loaded for your system + # + EOT + print SYSCONFIG +- "# Generated by sensors-detect on " . scalar localtime() . "\n"; ++ "# Generated by sensors-detect on " . scalar localtime() . "\n\n"; + my @modules = grep /^modprobe /, split "\n", $modprobes; ++ print SYSCONFIG ++ "# Load modules at startup\n". ++ "LOADMODULES=yes\n\n". ++ "# Initialize sensors at startup\n". ++ "INITSENSORS=yes\n\n"; + my $i = 0; + my $sysconfig = ""; + foreach (@modules) { +@@ -5785,10 +5811,8 @@ + $i++; + } + print SYSCONFIG $sysconfig; ++ print "Done.\n"; + +- 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"; + } + } + diff --git a/sys-apps/lm_sensors/files/lm_sensors-3-init.d b/sys-apps/lm_sensors/files/lm_sensors-3-init.d new file mode 100644 index 0000000..18fb353 --- /dev/null +++ b/sys-apps/lm_sensors/files/lm_sensors-3-init.d @@ -0,0 +1,105 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-3-init.d,v 1.1 2008/03/17 07:59:28 dberkholz Exp $ + +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.0.1-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch new file mode 100644 index 0000000..a17cf1a --- /dev/null +++ b/sys-apps/lm_sensors/files/lm_sensors-3.0.1-sensors-detect-gentoo.patch @@ -0,0 +1,116 @@ +diff -urN lm_sensors-3.0.1.orig/prog/detect/sensors-detect lm_sensors-3.0.1/prog/detect/sensors-detect +--- lm_sensors-3.0.1.orig/prog/detect/sensors-detect 2008-01-22 04:22:47.000000000 -0800 ++++ lm_sensors-3.0.1/prog/detect/sensors-detect 2008-03-16 15:52:15.000000000 -0700 +@@ -26,6 +26,9 @@ + # each be put in a separate file, using modules and packages. That is beyond + # me. + ++# Gentoo specific modifications based on a patch from Rudo Thomas ++# ++ + require 5.004; + + use strict; +@@ -5871,29 +5874,35 @@ + 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". +- "$modules_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'); +- $_ = ; +- 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 ($!)"; +- } +- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") +- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; +- print SYSCONFIG <<'EOT'; +-# /etc/sysconfig/lm_sensors - Defines modules loaded by +-# /etc/init.d/lm_sensors ++ 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 = ; ++ ++ 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 = ; ++ } ++ open(SYSCONFIG, ">".$filename) ++ or die "Sorry, can't create $filename ($!)."; ++ print SYSCONFIG <<'EOT'; ++# /etc/conf.d/sensors - Defines modules loaded by /etc/init.d/lm_sensors + # Copyright (c) 1998 - 2001 Frodo Looijaard + # + # This program is free software; you can redistribute it and/or modify +@@ -5921,12 +5930,21 @@ + # in order as normal variables with the special names: + # 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. ++# + # List the modules that are to be loaded for your system + # + EOT + print SYSCONFIG +- "# Generated by sensors-detect on " . scalar localtime() . "\n"; ++ "# Generated by sensors-detect on " . scalar localtime() . "\n\n"; + my @modules = grep /^modprobe /, split "\n", $modprobes; ++ print SYSCONFIG ++ "# Load modules at startup\n". ++ "LOADMODULES=yes\n\n". ++ "# Initialize sensors at startup\n". ++ "INITSENSORS=yes\n\n"; + my $i = 0; + my $sysconfig = ""; + foreach (@modules) { +@@ -5936,10 +5954,8 @@ + } + print SYSCONFIG $sysconfig; + close(SYSCONFIG); ++ print "Done.\n"; + +- 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"; + + if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { + system("/sbin/insserv", "/etc/init.d/lm_sensors"); +@@ -5948,15 +5964,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". +- $modprobes. +- (-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-init.d b/sys-apps/lm_sensors/files/lm_sensors-init.d new file mode 100644 index 0000000..c80ed31 --- /dev/null +++ b/sys-apps/lm_sensors/files/lm_sensors-init.d @@ -0,0 +1,105 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/lm_sensors-init.d,v 1.3 2007/06/12 08:52:16 zzam Exp $ + +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/sensors.conf ]; then + eerror "/etc/sensors.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/sensord-conf.d b/sys-apps/lm_sensors/files/sensord-conf.d new file mode 100644 index 0000000..d82841a --- /dev/null +++ b/sys-apps/lm_sensors/files/sensord-conf.d @@ -0,0 +1,3 @@ +# 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-init.d b/sys-apps/lm_sensors/files/sensord-init.d new file mode 100644 index 0000000..cb99dce --- /dev/null +++ b/sys-apps/lm_sensors/files/sensord-init.d @@ -0,0 +1,33 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/files/sensord-init.d,v 1.1 2007/05/17 07:31:41 phreak Exp $ + +CONFIG=/etc/sensors.conf + +depend() { + need logger + use lm_sensors +} + +checkconfig() { + if [ ! -f ${CONFIG} ]; then + eerror "Configuration file ${CONFIG} not found" + return 1 + fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting sensord" + start-stop-daemon --start --exec /usr/sbin/sensord \ + -- --config-file ${CONFIG} ${SENSORD_OPTIONS} + eend ${?} +} + +stop() { + ebegin "Stopping sensord" + start-stop-daemon --stop --pidfile /var/run/sensord.pid + eend ${?} +} diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.6.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.6.ebuild new file mode 100644 index 0000000..b0f0dca --- /dev/null +++ b/sys-apps/lm_sensors/lm_sensors-2.10.6.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.4.ebuild,v 1.9 2008/05/18 18:54:11 armin76 Exp $ + +inherit eutils flag-o-matic linux-info toolchain-funcs multilib + +DESCRIPTION="Hardware Monitoring user-space utilities" + +HOMEPAGE="http://www.lm-sensors.org/" +SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ppc ~sparc x86" + +IUSE="sensord" + +COMMON="sys-fs/sysfsutils + !sys-apps/i2c-tools + sensord? ( net-analyzer/rrdtool )" +DEPEND="${COMMON} + sys-apps/sed + ppc? ( >=virtual/linux-sources-2.5 ) + amd64? ( || ( >=virtual/linux-sources-2.5 >=sys-kernel/vserver-sources-2.0 ) ) + x86? ( || ( >=virtual/linux-sources-2.5 >=sys-kernel/vserver-sources-2.0 sys-apps/lm_sensors-modules ) )" +RDEPEND="${COMMON} + dev-lang/perl + >=x11-misc/read-edid-1.4.1-r1 + virtual/logger" + +pkg_setup() { + linux-info_pkg_setup + + if kernel_is 2 4; then + if use ppc || use amd64; then + eerror + eerror "${P} does not support kernel 2.4.x under PPC and AMD64." + eerror + die "${P} does not support kernel 2.4.x under PPC and AMD64." + elif ! has_version =sys-apps/lm_sensors-modules-${PV}; then + eerror + eerror "${P} needs sys-apps/lm_sensors-modules-${PV} to be installed" + eerror "for kernel 2.4.x" + eerror + die "sys-apps/lm_sensors-modules-${PV} not installed" + fi + else + if kernel_is lt 2 6 14 && ! (linux_chkconfig_present I2C_SENSOR); then + eerror + eerror "${P} requires CONFIG_I2C_SENSOR to be enabled for non-2.4.x kernels." + eerror + die "CONFIG_I2C_SENSOR not detected" + elif kernel_is gt 2 6 13 && ! (linux_chkconfig_present HWMON); then + eerror + eerror "${P} requires CONFIG_HWMON to be enabled for 2.6.14+ kernels." + eerror + die "CONFIG_HWMON not detected" + fi + if ! (linux_chkconfig_present I2C_CHARDEV); then + ewarn + ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled for non-2.4.x kernels." + ewarn + fi + if ! (linux_chkconfig_present I2C); then + ewarn + ewarn "${P} requires CONFIG_I2C to be enabled for non-2.4.x kernels for most sensors." + ewarn + fi + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${PN}-2.10.4-sensors-detect-gentoo.patch + + if use sensord; then + sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile + fi +} + +src_compile() { + einfo + einfo "You may safely ignore any errors from compilation" + einfo "that contain \"No such file or directory\" references." + einfo + + filter-flags -fstack-protector + + emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \ + || die "emake user failed" +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \ + KERNELINCLUDEFILES="" user_install || die "emake user_install failed" + + newinitd "${FILESDIR}"/lm_sensors-init.d lm_sensors + newinitd "${FILESDIR}"/fancontrol-init.d fancontrol + + if use sensord; then + newconfd "${FILESDIR}"/sensord-conf.d sensord + newinitd "${FILESDIR}"/sensord-init.d sensord + fi + + dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \ + README* TODO + + dodoc doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \ + doc/progs doc/temperature-sensors doc/vid + + dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html + + docinto busses + dodoc doc/busses/* + + docinto chips + dodoc doc/chips/* + + docinto developers + dodoc doc/developers/applications doc/developers/design \ + doc/developers/new_drivers doc/developers/proc \ + doc/developers/sysctl doc/developers/sysfs-interface +} + +pkg_postinst() { + elog + elog "Please run \`/usr/sbin/sensors-detect' in order to setup" + elog "/etc/conf.d/lm_sensors." + elog + elog "/etc/conf.d/lm_sensors is vital to the init-script." + elog "Please make sure you also add lm_sensors to the desired" + elog "runlevel. Otherwise your I2C modules won't get loaded" + elog "on the next startup." + elog + elog "You will also need to run the above command if you're upgrading from" + elog "<=${PN}-2.9.0, as the needed entries in /etc/conf.d/lm_sensors has" + elog "changed." + elog + elog "Be warned, the probing of hardware in your system performed by" + elog "sensors-detect could freeze your system. Also make sure you read" + elog "the documentation before running lm_sensors on IBM ThinkPads." + elog + elog "Please refer to the lm_sensors documentation for more information." + elog "(http://www.lm-sensors.org/wiki/Documentation)" + elog +} diff --git a/sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild b/sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild new file mode 100644 index 0000000..9b7d7e3 --- /dev/null +++ b/sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-3.0.1.ebuild,v 1.1 2008/03/17 07:59:27 dberkholz Exp $ + +inherit eutils flag-o-matic linux-info toolchain-funcs multilib + +DESCRIPTION="Hardware Monitoring user-space utilities" + +HOMEPAGE="http://www.lm-sensors.org/" +SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" + +IUSE="sensord" + +COMMON="sensord? ( net-analyzer/rrdtool )" +DEPEND="${COMMON} + sys-apps/sed" +RDEPEND="${COMMON} + dev-lang/perl + virtual/logger" + +pkg_setup() { + linux-info_pkg_setup + + if ! linux_chkconfig_present HWMON; then + eerror + eerror "${P} requires CONFIG_HWMON to be enabled." + eerror + die "CONFIG_HWMON not detected" + fi + if ! linux_chkconfig_present I2C_CHARDEV; then + ewarn + ewarn "sensors-detect requires CONFIG_I2C_CHARDEV to be enabled." + ewarn + fi + if ! linux_chkconfig_present I2C; then + ewarn + ewarn "${P} requires CONFIG_I2C to be enabled for most sensors." + ewarn + fi +} + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${PN}-3.0.1-sensors-detect-gentoo.patch + + if use sensord; then + sed -i -e 's:^# \(PROG_EXTRA\):\1:' "${S}"/Makefile + fi +} + +src_compile() { + einfo + einfo "You may safely ignore any errors from compilation" + einfo "that contain \"No such file or directory\" references." + einfo + + filter-flags -fstack-protector + + emake CC=$(tc-getCC) \ + || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man LIBDIR=/usr/$(get_libdir) \ + install || die "emake install failed" + + newinitd "${FILESDIR}"/lm_sensors-3-init.d lm_sensors + newinitd "${FILESDIR}"/fancontrol-init.d fancontrol + + if use sensord; then + newconfd "${FILESDIR}"/sensord-conf.d sensord + newinitd "${FILESDIR}"/sensord-init.d sensord + fi + + dodoc BACKGROUND BUGS CHANGES CONTRIBUTORS INSTALL QUICKSTART \ + README* TODO + + dodoc doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \ + doc/progs doc/temperature-sensors doc/vid + + dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html + + docinto chips + dodoc doc/chips/* + + docinto developers + dodoc doc/developers/applications +} + +pkg_postinst() { + elog + elog "Please run \`/usr/sbin/sensors-detect' in order to setup" + elog "/etc/conf.d/lm_sensors." + elog + elog "/etc/conf.d/lm_sensors is vital to the init-script." + elog "Please make sure you also add lm_sensors to the desired" + elog "runlevel. Otherwise your I2C modules won't get loaded" + elog "on the next startup." + elog + elog "You will also need to run the above command if you're upgrading from" + elog "<=${PN}-2, as the needed entries in /etc/conf.d/lm_sensors has" + elog "changed." + elog + elog "Be warned, the probing of hardware in your system performed by" + elog "sensors-detect could freeze your system. Also make sure you read" + elog "the documentation before running lm_sensors on IBM ThinkPads." + elog + elog "Please refer to the lm_sensors documentation for more information." + elog "(http://www.lm-sensors.org/wiki/Documentation)" + elog +} -- cgit v1.2.3-65-gdbad