summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2007-12-01 13:13:14 -0800
committerEric Sandall2007-12-01 13:13:14 -0800
commitbb2c97c61cb63f378153f270c58d3ae2102737c1 (patch)
tree2593bf033a0d5cb7afe984d50ef068dc6ee79df2
parent5c7fd0d4a4237b4c2d221b69911a0b1bb7c4fca0 (diff)
Revert "lm_sensors: removed support for 2.4.X linux kernels"
This reverts commit 1e97e129f97e004e0481f215eebf81eee64e9ed6. Reverting API breakage from stable for now per Arwed
-rwxr-xr-xkernels/lm_sensors/BUILD6
-rwxr-xr-xkernels/lm_sensors/DEPENDS3
-rw-r--r--kernels/lm_sensors/HISTORY4
-rwxr-xr-xkernels/lm_sensors/INSTALL18
4 files changed, 24 insertions, 7 deletions
diff --git a/kernels/lm_sensors/BUILD b/kernels/lm_sensors/BUILD
index bee6666754..a844f10b92 100755
--- a/kernels/lm_sensors/BUILD
+++ b/kernels/lm_sensors/BUILD
@@ -1 +1,5 @@
-make all
+if [[ $(uname -r) == 2.4.* ]] ; then
+ make
+elif [[ $(uname -r) == 2.6.* ]]; then
+ make user
+fi
diff --git a/kernels/lm_sensors/DEPENDS b/kernels/lm_sensors/DEPENDS
index 36541bf44e..058b5e94dc 100755
--- a/kernels/lm_sensors/DEPENDS
+++ b/kernels/lm_sensors/DEPENDS
@@ -1 +1,2 @@
-depends sysfsutils
+depends sysfsutils &&
+optional_depends i2c "" "" "for 2.4.X kernels, 2.6.X kernels must build from kernel tree"
diff --git a/kernels/lm_sensors/HISTORY b/kernels/lm_sensors/HISTORY
index 36a4af6f4f..bdf0d612f6 100644
--- a/kernels/lm_sensors/HISTORY
+++ b/kernels/lm_sensors/HISTORY
@@ -1,7 +1,3 @@
-2007-12-01 Ladislav Hagara <hgr@vabo.cz>
- * DEPENDS, BUILD, INSTALL: removed support for 2.4.X linux kernels
- lm_sensors 3.0 support only linux kernels > 2.6.5
-
2007-11-26 Pol Vinogradov <vin.public@gmail.com>
* DETAILS: updated to 3.0.0, changed tarball and signature extensions
* lm_sensors.gpg: now contains 38F02FC8 key
diff --git a/kernels/lm_sensors/INSTALL b/kernels/lm_sensors/INSTALL
index 621f3f869f..a1dff2e6c5 100755
--- a/kernels/lm_sensors/INSTALL
+++ b/kernels/lm_sensors/INSTALL
@@ -1 +1,17 @@
-make PREFIX=${INSTALL_ROOT}/usr install
+if [[ $(uname -r) == 2.4.* ]] ; then
+ make I2C_HEADERS=/usr/include \
+ PREFIX=${INSTALL_ROOT}/usr \
+ install &&
+ if [[ "`ls /dev/ | grep i2c-`" == "" ]]
+ then
+ prog/mkdev/mkdev.sh
+ fi
+ # ignore depmod errors
+ ( depmod -a || true )
+elif [[ $(uname -r) == 2.6.* ]]; then
+ make PREFIX=${INSTALL_ROOT}/usr user_install &&
+ if [[ "`ls /dev/ | grep i2c-`" == "" ]]
+ then
+ prog/mkdev/mkdev.sh
+ fi
+fi