[Devil-linux-commit] build/scripts lm_sensors, 1.23, 1.24 nbd, 1.4, 1.5 prepare, 1.62, 1.63 settings, 1.51, 1.52

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

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

Modified Files:
	lm_sensors nbd prepare settings 
Log Message:
fixed kernel config
always do highmem support and smp


Index: lm_sensors
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- lm_sensors	20 Mar 2007 02:41:45 -0000	1.23
+++ lm_sensors	22 Mar 2007 01:48:37 -0000	1.24
@@ -28,14 +28,6 @@
 case $1 in
 	build )
 		if [ "$CONFIG_LM_SENSORS" = "y" ]; then
-			# 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/sensors
 			set_all_kernel_options drivers/i2c
 
@@ -46,16 +38,13 @@
 			#make dep || exit 1
 			cd $OLDDIR || exit 1
 
-			SMP=0
-			test "$CONFIG_LINUX_SMP" = "y" && SMP=1
-
 			EXTRA=""
 			if [ "$CONFIG_RRDTOOL" = "y" ];then
 				cp -f /usr/include/rrd.h . || exit 1
 				EXTRA="PROG_EXTRA:=sensord"
 			fi
 
-			make user $PMAKE PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 $EXTRA || exit 1
+			make user $PMAKE PREFIX=/usr SMP=1 MANDIR=/usr/share/man COMPILE_KERNEL=0 $EXTRA || exit 1
 
 			strip_debug
 		else
@@ -77,7 +66,7 @@
 				EXTRA="PROG_EXTRA:=sensord"
 			fi
 
-			make user_install DESTDIR=$TMPDIR PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man $EXTRA || exit 1
+			make user_install DESTDIR=$TMPDIR PREFIX=/usr SMP=1 MANDIR=/usr/share/man $EXTRA || exit 1
 
 			copy_docs $TMPDIR
 			mkdir -p $DOCDIR/lm_sensors || exit 1

Index: nbd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nbd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nbd	11 Nov 2005 20:43:42 -0000	1.4
+++ nbd	22 Mar 2007 01:48:37 -0000	1.5
@@ -28,11 +28,8 @@
 case $1 in
 	build )
 		if [ "$CONFIG_ENBD" = "y" ]; then
-			SMP=0
-			test "$CONFIG_LINUX_SMP" = "y" && SMP=1
-
 			# doesn't like parallel builds
-			make config all PREFIX=/usr prefix=/usr SMP=$SMP BUILD=$(pwd)/build || exit 1
+			make config all PREFIX=/usr prefix=/usr SMP=1 BUILD=$(pwd)/build || exit 1
 
 			strip_debug
 		fi

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- prepare	20 Mar 2007 02:41:45 -0000	1.62
+++ prepare	22 Mar 2007 01:48:37 -0000	1.63
@@ -59,20 +59,8 @@
 
 	cp -v $KERNEL_CONFIG_DIR/config_linux $KERNELDIR/.config || exit 1
 
-	if [ "$CONFIG_HIGHMEM" == "y" ]; then
-		cat $KERNEL_CONFIG_DIR/config_highmem.yes >> $KERNELDIR/.config || exit 1
-	else
-		cat $KERNEL_CONFIG_DIR/config_highmem.no >> $KERNELDIR/.config || exit 1
-	fi
-
 	cat $KERNEL_CONFIG_DIR/config_linux.$CONFIG_KERNEL_CPU >> $KERNELDIR/.config || exit 1
 
-	if [ "$CONFIG_LINUX_SMP" == "y" ]; then
-		cat $KERNEL_CONFIG_DIR/config_linux.smp  >> $KERNELDIR/.config || exit 1
-	else
-		cat $KERNEL_CONFIG_DIR/config_linux.up  >> $KERNELDIR/.config || exit 1
-	fi
-
 	if [ "$CONFIG_ALSA" == "y" ]; then
 		cat $KERNEL_CONFIG_DIR/config_linux.alsa >> $KERNELDIR/.config || exit 1
 	fi
@@ -129,12 +117,14 @@
 	esac
 	
 	# make sure all netfilter modules are enabled
-	set_all_kernel_options net/bridge/netfilter
+	set_all_kernel_options net/bridge
+	set_all_kernel_options net/netfilter
 	set_all_kernel_options net/ipv4/netfilter
 	set_all_kernel_options net/ipv6/netfilter
 					 
+	set_all_kernel_options crypto
 	set_all_kernel_options drivers/i2c
-
+	
 	make oldconfig || exit 1
 
 	popd > /dev/null

Index: settings
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/settings,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- settings	20 Mar 2007 02:41:45 -0000	1.51
+++ settings	22 Mar 2007 01:48:37 -0000	1.52
@@ -60,7 +60,6 @@
 	DL_VERSION="$(cat $SCRCONFIG/VERSION)-$(date -u --iso-8601)"
 fi
 DL_VERSION_FULL="$DL_VERSION-i$CONFIG_CPU"
-[ "$CONFIG_LINUX_SMP" = "y" ] && DL_VERSION_FULL="${DL_VERSION_FULL}-SMP"
 
 ISODIR=$WORKDIR/ISO
 INITRDDIR=$ISODIR/initrdtree