Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.16 grimoire by Eric Sandall (bb2c97c61cb63f378153f270c58d3ae2102737c1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.16 grimoire by Eric Sandall (bb2c97c61cb63f378153f270c58d3ae2102737c1)
  • Date: Sat, 1 Dec 2007 15:15:31 -0600

GIT changes to stable-rc-0.16 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

kernels/lm_sensors/BUILD | 6 +++++-
kernels/lm_sensors/DEPENDS | 3 ++-
kernels/lm_sensors/HISTORY | 4 ----
kernels/lm_sensors/INSTALL | 18 +++++++++++++++++-
4 files changed, 24 insertions(+), 7 deletions(-)

New commits:
commit bb2c97c61cb63f378153f270c58d3ae2102737c1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "lm_sensors: removed support for 2.4.X linux kernels"

This reverts commit 1e97e129f97e004e0481f215eebf81eee64e9ed6.

Reverting API breakage from stable for now per Arwed

diff --git a/kernels/lm_sensors/BUILD b/kernels/lm_sensors/BUILD
index bee6666..a844f10 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 36541bf..058b5e9 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 36a4af6..bdf0d61 100644
--- a/kernels/lm_sensors/HISTORY
+++ b/kernels/lm_sensors/HISTORY
@@ -1,7 +1,3 @@
-2007-12-01 Ladislav Hagara <hgr AT 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 AT 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 621f3f8..a1dff2e 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



  • [SM-Commit] GIT changes to stable-rc-0.16 grimoire by Eric Sandall (bb2c97c61cb63f378153f270c58d3ae2102737c1), Eric Sandall, 12/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page