Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (358708598837de7908bafeabaf84f724e9c3c2ee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (358708598837de7908bafeabaf84f724e9c3c2ee)
  • Date: Sun, 9 Dec 2007 07:55:02 -0600

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

kernels/lm_sensors/BUILD | 13 ++++++++++++-
kernels/lm_sensors/DEPENDS | 6 ++++++
kernels/lm_sensors/DETAILS | 15 +++++++++++++++
kernels/lm_sensors/HISTORY | 5 +++++
kernels/lm_sensors/INSTALL | 25 ++++++++++++++++++++++++-
kernels/lm_sensors/PREPARE | 1 +
kernels/lm_sensors/lm_sensors.gpg |binary
7 files changed, 63 insertions(+), 2 deletions(-)

New commits:
commit 358708598837de7908bafeabaf84f724e9c3c2ee
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

lm_sensors: added possibility to choose between 2 and 3 branches [Bug
14157]

diff --git a/kernels/lm_sensors/BUILD b/kernels/lm_sensors/BUILD
index bee6666..6f39488 100755
--- a/kernels/lm_sensors/BUILD
+++ b/kernels/lm_sensors/BUILD
@@ -1 +1,12 @@
-make all
+case $LM_SENSORS_BRANCH in
+ 2)
+ if [[ $(uname -r) == 2.4.* ]] ; then
+ make
+ elif [[ $(uname -r) == 2.6.* ]]; then
+ make user
+ fi
+ ;;
+ 3)
+ make all
+ ;;
+esac
diff --git a/kernels/lm_sensors/DEPENDS b/kernels/lm_sensors/DEPENDS
index 36541bf..d3f8b5c 100755
--- a/kernels/lm_sensors/DEPENDS
+++ b/kernels/lm_sensors/DEPENDS
@@ -1 +1,7 @@
+case $LM_SENSORS_BRANCH in
+ 2)
+ optional_depends i2c "" "" "for 2.4.X kernels, 2.6.X kernels must
build from kernel tree"
+ ;;
+esac &&
+
depends sysfsutils
diff --git a/kernels/lm_sensors/DETAILS b/kernels/lm_sensors/DETAILS
index 7d1bf8e..0e0971c 100755
--- a/kernels/lm_sensors/DETAILS
+++ b/kernels/lm_sensors/DETAILS
@@ -1,7 +1,22 @@
SPELL=lm_sensors
+
+if [ -z "$LM_SENSORS_BRANCH" ] || [ "$LM_SENSORS_BRANCH" == "DEFAULT" ]; then
+ LM_SENSORS_BRANCH=2
+fi
+
+case $LM_SENSORS_BRANCH in
+ 2)
+ VERSION=2.10.5
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SPELL-$VERSION.tar.gz.asc
+ ;;
+ 3)
VERSION=3.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SPELL-$VERSION.tar.bz2.sig
+ ;;
+esac
+
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=http://dl.lm-sensors.org/lm-sensors/releases/$SOURCE
SOURCE2_URL=http://dl.lm-sensors.org/lm-sensors/releases/$SOURCE2
diff --git a/kernels/lm_sensors/HISTORY b/kernels/lm_sensors/HISTORY
index 36a4af6..427fd68 100644
--- a/kernels/lm_sensors/HISTORY
+++ b/kernels/lm_sensors/HISTORY
@@ -1,3 +1,8 @@
+2007-12-09 Ladislav Hagara <hgr AT vabo.cz>
+ * PREPARE, DETAILS, DEPENDS, BUILD, INSTALL: added possibility to
choose
+ between 2 and 3 branches (DEFAULT=2) [Bug 14157]
+ * lm_sensors.gpg: now contains both 38F02FC8 and 65236AD5 keys
+
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
diff --git a/kernels/lm_sensors/INSTALL b/kernels/lm_sensors/INSTALL
index 621f3f8..67527df 100755
--- a/kernels/lm_sensors/INSTALL
+++ b/kernels/lm_sensors/INSTALL
@@ -1 +1,24 @@
-make PREFIX=${INSTALL_ROOT}/usr install
+case $LM_SENSORS_BRANCH in
+ 2)
+ 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
+ ;;
+ 3)
+ make PREFIX=${INSTALL_ROOT}/usr install
+ ;;
+esac
diff --git a/kernels/lm_sensors/PREPARE b/kernels/lm_sensors/PREPARE
new file mode 100755
index 0000000..d7aa46c
--- /dev/null
+++ b/kernels/lm_sensors/PREPARE
@@ -0,0 +1 @@
+config_query_list LM_SENSORS_BRANCH "Which branch of $SPELL do you want to
build?" DEFAULT 2 3
diff --git a/kernels/lm_sensors/lm_sensors.gpg
b/kernels/lm_sensors/lm_sensors.gpg
index f2d86fc..44aeeb6 100644
Binary files a/kernels/lm_sensors/lm_sensors.gpg and
b/kernels/lm_sensors/lm_sensors.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (358708598837de7908bafeabaf84f724e9c3c2ee), Ladislav Hagara, 12/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page