[Devil-linux-commit] build/scripts build.sh,1.79,1.80 i2c,1.8,1.9 lm_sensors,1.20,1.21 module-init-tools,1.2,1.3 modutils,1.16,1.17 mtools,1.7,1.8 mxser,1.1,1.2 raidtools,1.14,1.15

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26330/scripts

Modified Files:
	build.sh i2c lm_sensors module-init-tools modutils mtools 
	mxser raidtools 
Log Message:
- disable i2c/lm_sensors kernel modules when lm_sensors is not selected
- more changes to the build system to get everything working in with kernel 2.6


Index: raidtools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/raidtools,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- raidtools	11 Jan 2004 14:43:05 -0000	1.14
+++ raidtools	21 Jul 2004 23:33:19 -0000	1.15
@@ -25,6 +25,8 @@
 
 MYNAME=RAIDTOOLS
 
+test "$CONFIG_LINUX_VERSION" = "2.6" && exit 0
+
 case $1 in
     build )
 	if [ "$CONFIG_RAIDTOOLS" = "y" ]; then

Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- build.sh	11 Apr 2004 00:21:56 -0000	1.79
+++ build.sh	21 Jul 2004 23:33:19 -0000	1.80
@@ -151,7 +151,7 @@
 	prepare )
 			#before we do anything, we have to make sure kernel includes and that kind of stuff exist
 			echo running prepare
-			./prepare prepare
+			./prepare prepare || exit 1
 
 			if [ ! -e /sbin/insserv ]; then
 				echo "insserv not found"

Index: modutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/modutils,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- modutils	16 Jan 2004 01:47:55 -0000	1.16
+++ modutils	21 Jul 2004 23:33:19 -0000	1.17
@@ -30,6 +30,9 @@
 	# Parallel jobs does not work ($PMAKE)
 	make all || exit 1
 	strip_debug
+	# install it in the system, we need to make sure we use an up-to-date version
+	rm /sbin/{insmod,modprobe,depmod,rmmod}
+	make install
         ;;
 
     install )

Index: module-init-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/module-init-tools,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- module-init-tools	16 Jan 2004 01:47:55 -0000	1.2
+++ module-init-tools	21 Jul 2004 23:33:19 -0000	1.3
@@ -30,6 +30,7 @@
 		./configure --prefix= --enable-zlib || exit 1
 		make all $PMAKE || exit 1
 		strip_debug
+		# install it in the system, we need to make sure we use an up-to-date version
 		rm /sbin/{insmod,modprobe,depmod,rmmod}
 		make install || exit 1
 		;;

Index: mtools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mtools,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mtools	11 Jan 2004 14:43:04 -0000	1.7
+++ mtools	21 Jul 2004 23:33:19 -0000	1.8
@@ -27,6 +27,7 @@
 case $1 in
 	build )
 	    if [ "$CONFIG_MTOOLS" = "y" ]; then
+		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 		./configure --prefix=/usr --localstatedir=/var || exit 1
 		make $PMAKE all || exit 1
 		strip_debug

Index: mxser
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mxser,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mxser	22 Mar 2004 02:23:18 -0000	1.1
+++ mxser	21 Jul 2004 23:33:19 -0000	1.2
@@ -23,6 +23,8 @@
 # source functions and config
 source $MYDIR/settings
 
+test "$CONFIG_LINUX_VERSION" = "2.6" && exit 0
+
 case $1 in
 	build )
 		if [ "$CONFIG_MOXIO_SMARTIO" = "y" ]; then

Index: lm_sensors
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- lm_sensors	11 Jul 2004 14:35:25 -0000	1.20
+++ lm_sensors	21 Jul 2004 23:33:19 -0000	1.21
@@ -58,6 +58,12 @@
 			make user $PMAKE PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 $EXTRA || exit 1
 
 			strip_debug
+		else
+			set_kernel_option CONFIG_I2C_SENSOR n
+			OLDDIR=$(pwd)
+			cd $KERNELDIR || exit 1
+			make oldconfig
+			cd $OLDDIR || exit 1
 		fi
 		;;
 

Index: i2c
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/i2c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- i2c	11 Jul 2004 14:35:20 -0000	1.8
+++ i2c	21 Jul 2004 23:33:19 -0000	1.9
@@ -27,12 +27,17 @@
 case $1 in
 	build )
 	if [ "$CONFIG_LM_SENSORS" = "y" ]; then
-		echo preparing patch
-		cd mkpatch || exit 1
-		./mkpatch.pl ../ $KERNELDIR | patch -p1 -d $KERNELDIR || exit 1
-		cd .. || exit 1
+		 # never apply the patch on a kernel >2.4 , we must use the kernel drivers
+                if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+		    echo preparing patch
+		    cd mkpatch || exit 1
+		    ./mkpatch.pl ../ $KERNELDIR | patch -p1 -d $KERNELDIR || exit 1
+		    cd .. || exit 1
+		fi
 		
 		set_all_kernel_options drivers/i2c
+	else
+		set_kernel_option CONFIG_I2C n
 	fi
 	;;
 	* )