[Devil-linux-commit] build/scripts quota-tools,NONE,1.1 super-freeswan,NONE,1.1 usbat-02,NONE,1.1 bu

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv27884/scripts

Modified Files:
	build.sh ebtables functions i2c insserv linux lm_sensors 
	patch-o-matic pcmcia-cs pcwd prepare 
Added Files:
	quota-tools super-freeswan usbat-02 
Log Message:
kernel 2.4.23 and many other updates/fixes

--- NEW FILE: quota-tools ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/quota-tools,v $
# $Revision: 1.1 $
# $Date: 2003/12/17 14:55:47 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       quota-tools
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings
source $MYDIR/functions

case $1 in
    build )
	if [ "$CONFIG_QUOTA_TOOLS" = "y" ]; then
		./configure --prefix= --mandir=/usr/share/man || exit 1
		make $PMAKE all || exit 1
		strip_debug
	fi
        ;;

    install )
	if [ "$CONFIG_QUOTA_TOOLS" = "y" ]; then
		rm -rf $WORKDIR/tmp || exit 1
		mkdir -p $WORKDIR/tmp || exit 1
		make install ROOTDIR=$WORKDIR/tmp || exit 1
		rm -rf $WORKDIR/tmp/share || exit 1
		rm -rf $WORKDIR/tmp/include || exit 1
		copy_docs $WORKDIR/tmp
		cp -dpR $WORKDIR/tmp/etc $ETCDIR/etc/ || exit 1
		rm -rf $WORKDIR/tmp/etc  || exit 1
		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
		rm -rf $WORKDIR/tmp || exit 1
	fi
    	;;

    * )
    	echo "ERROR ($0)"
        echo "please add parameter so I know what to do"
        exit 1
        ;;
esac


--- NEW FILE: super-freeswan ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/super-freeswan,v $
# $Revision: 1.1 $
# $Date: 2003/12/17 14:55:47 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       super-freeswan
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings
source $MYDIR/functions

MYNAME=FREESWAN
KERNELDIR=$(find_src_dir linux)

case $1 in
	build )
		if [ "$CONFIG_SUPER_FREESWAN" = "y" ]; then
			# update kernel config
			DIRS=$(ls klips/net/ipsec/alg/Config.*.in)
			DIRS="klips/net/ipsec/Config.in klips/net/ipsec/alg/Config.in $DIRS"
			for DIR in $DIRS
			do
				echo $DIR
				for CFG in $(  grep tristate $DIR | cut -d "'" -f 3 | cut -d " " -f 2 ); do
					echo "$CFG=m" >> $KERNELDIR/.config
				done
				for CFG in $(  grep bool $DIR | cut -d "'" -f 3 | cut -d " " -f 2 ); do
					if [ ! "$CFG" = "CONFIG_IPSEC_DEBUG" ] && [ ! "$CFG" = "CONFIG_IPSEC_ALG_NON_LIBRE" ] && [ ! "$CFG" = "CONFIG_IPSEC_ALG_CRYPTOAPI" ]; then
						echo "$CFG=y" >> $KERNELDIR/.config
					fi
				done
			done
			echo "CONFIG_IPSEC=m" >> $KERNELDIR/.config
			echo "# CONFIG_IPSEC_DEBUG is not set" >> $KERNELDIR/.config
			echo "# CONFIG_IPSEC_ALG_CRYPTOAPI is not set" >> $KERNELDIR/.config
			echo "# CONFIG_IPSEC_ALG_NON_LIBRE is not set" >> $KERNELDIR/.config

			replace_str Makefile.inc /usr/local /usr
			replace_str Makefile.inc /usr/src/linux $KERNELDIR
			replace_str ./fswcert/Makefile /usr/local /usr

			KERNELSRC=$KERNELDIR

			# compile freeswan
			FLAGS=""
			if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
				FLAGS="CFLAGS_EXTRA=-fno-stack-protector"
			fi

			# parallel build fails - do not use $PMAKE
			make $FLAGS oldmod || exit 1
			make programs || exit 1

			strip_debug

		fi
		;;

	install )
		if [ "$CONFIG_SUPER_FREESWAN" = "y" ]; then
			rm -rf $WORKDIR/tmp
			mkdir -p $WORKDIR/tmp || exit 1
			make install DESTDIR=$WORKDIR/tmp || exit 1
			copy_docs $WORKDIR/tmp
			mkdir -p $DOCDIR/freeswan || exit 1
			cp -dpR doc/* $DOCDIR/freeswan || exit 1
			cp -dpR CHANGES* $DOCDIR/freeswan || exit 1
			cp -dpR README* $DOCDIR/freeswan || exit 1
			rm -rf $WORKDIR/tmp/usr/local || exit 1
			cp -dpR $WORKDIR/tmp/usr $CDDIR || exit 1
			cp -dpR $WORKDIR/tmp/etc/ipsec.* $ETCDIR/etc/ || exit 1
			cp -p $MYDIR/scripts/ipsec $ETCDIR/etc/init.d || exit 1
			rm -rf $WORKDIR/tmp || exit 1
			mkdir -pm 700 $ETCDIR/etc/ipsec.d/cacerts || exit 1
			mkdir -pm 700 $ETCDIR/etc/ipsec.d/crls || exit 1

			# fix a problem with the read-only modules.dep
			replace_str $CDDIR/usr/lib/ipsec/_startklips "depmod -a >" "depmod -an >"
			rm $CDDIR/usr/lib/ipsec/_startklips.old

			echo "# Start $MYNAME?" >> $CONFIGFILE
			echo "START_IPSEC=no" >> $CONFIGFILE
			echo >> $CONFIGFILE
			echo "HELP_IPSEC=\"IPSEC is the $MYNAME VPN using the IPSEC protocol\"" >> $SOFTWAREHELP
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


--- NEW FILE: usbat-02 ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/usbat-02,v $
# $Revision: 1.1 $
# $Date: 2003/12/17 14:55:47 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       usbat-02
# Required-Start: $basebuildtools $libs
# Required-Stop:
# Default-Start:  1
# Default-Stop:
# Description:    support for some usb cf card readers
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings
source $MYDIR/functions

case $1 in
	build )
		if [ "$CONFIG_USBAT02" = "y" ]; then
			USBATDIR=$(pwd)
			KERNELDIR=$(find_src_dir linux)
			pushd $KERNELDIR/drivers/usb/storage > /dev/null || exit 1
			cp -v $USBATDIR/src/usbat2.{c,h} . || exit 1
			perl $USBATDIR/src/modify.pl
			popd > /dev/null
			bzcat $DL_DIR/src/usbat02-kernel-config.diff.bz2 | patch -d $KERNELDIR -p1 || exit 1
			bzcat $DL_DIR/src/usbat02-kernel-Makefile.diff.bz2 | patch -d $KERNELDIR -p1 || exit 1
			echo "CONFIG_USB_STORAGE_USBAT2=m" >> $KERNELDIR/.config || exit 1
		fi
		;;

	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- build.sh	7 Nov 2003 23:19:40 -0000	1.60
+++ build.sh	17 Dec 2003 14:55:47 -0000	1.61
@@ -257,6 +257,8 @@
 			    export PATH=/usr/lib/distcc/bin:$PATH
 			fi
 
+			mkdir -p $WORKDIR/LOGS/$CMD || exit 1
+
 			for LINK in $( ls -v $DL_DIR/scripts/.buildorder/rc$LEVEL.d/S* 2> /dev/null)
 			do
 				LINK=${LINK##/*/}
@@ -284,11 +286,28 @@
 						echo -n " (in $SOURCEDIR)"
 					fi
 					echo
-					if ! $MYDIR/$SCRIPT $CMD; then
+					t1=$(date +"%s")
+
+					if [ -z "$RUN_ONLY_CMD" ];then
+						$MYDIR/$SCRIPT $CMD &> $WORKDIR/LOGS/$CMD/$SCRIPT
+					else
+						$MYDIR/$SCRIPT $CMD
+					fi
+					RETVAL=$?
+					t2=$(date +"%s")
+					t=$((t2-t1))
+					# set the execution time to 1 when it's < 1, since we don't use nanoseconds
+					test $t -eq 0 && t=1
+					echo -n "$CMD $SCRIPT $t" >> $WORKDIR/LOGS/DL_BUILD_LOG
+					if [ $RETVAL -gt 0 ]; then
 						echo "ERROR"
 						echo "$MYDIR/$SCRIPT $CMD failed"
+						echo " FAILED" >> $WORKDIR/LOGS/DL_BUILD_LOG
+						echo "check log file for details"
 						exit 1
-						fi
+					else
+						echo " OK" >> $WORKDIR/LOGS/DL_BUILD_LOG
+					fi
 					touch ${DONEFILE}
 					if dirs +1 &>/dev/null; then
 						popd > /dev/null

Index: ebtables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ebtables,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ebtables	15 Nov 2003 14:08:01 -0000	1.2
+++ ebtables	17 Dec 2003 14:55:47 -0000	1.3
@@ -33,7 +33,7 @@
 			zcat $DL_DIR/src/ebtables-brnf-*.diff.gz | patch -p 1 -d $KERNELDIR || exit 1
 
 			# update kernel config
-			for CFG in $(  grep dep_tristate $KERNELDIR/net/bridge/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+			for CFG in $(  grep tristate $KERNELDIR/net/bridge/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 				echo "$CFG=m" >> $KERNELDIR/.config
 			done
 			for CFG in $(  grep bool $KERNELDIR/net/bridge/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do

Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- functions	14 Jul 2003 13:27:09 -0000	1.41
+++ functions	17 Dec 2003 14:55:47 -0000	1.42
@@ -134,16 +134,39 @@
 
 # add menu entry for config
 # parameters: menu type text variable
-menu_add ()
+function menu_add ()
 {
 	MENU=""
 	MENUOLD=""
 	X="Main|${1// /___}"
+	Y=${X//|/^}
+	if [ -n "${Y%$CURRENTMENU*}" ]; then
+		return
+	fi
+
+	X="Main|${1// /___}"
 	for M in $(echo "$X" |  cut -d "|" -f 1- --output-delimiter=" " )
 	do
 		MENUOLD=$MENU
 		MENU=$MENU"^"$M
 		MM=${M//___/ }
+
+		# let the next few lines disabled
+		if [ 0 = 1 ]; then
+		#if [ ! "$MENU" = "$CURRENTMENU" ]; then
+			echo $MENU
+			Y=${MENU:1}
+			echo $Y
+			Y=${Y#$CURRENTMENU*}
+			Y=${Y:1}
+			echo $Y
+			Y=${Y%%*^*}
+			if [ -z "$Y" ]; then
+				echo CONTINUE
+				#continue
+			fi
+		fi
+
 		if [ ! -f "$WORKDIR/.menu$MENU" ]; then
 			set_geometry `stty size 2>/dev/null`
 			echo -n \'submenu $M\' \'--\> $MM\' " " >> "$WORKDIR/.menu$MENUOLD"

Index: i2c
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/i2c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i2c	13 Oct 2003 17:36:08 -0000	1.2
+++ i2c	17 Dec 2003 14:55:47 -0000	1.3
@@ -32,7 +32,7 @@
 		cd mkpatch || exit 1
 		./mkpatch.pl ../ $KERNELDIR | patch -p1 -d $KERNELDIR || exit 1
 		cd .. || exit 1
-		for CFG in $(  grep dep_tristate $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+		for CFG in $(  grep tristate $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=m" >> $KERNELDIR/.config
 		done
 		for CFG in $(  grep bool $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do

Index: insserv
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/insserv,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- insserv	13 Oct 2003 17:36:08 -0000	1.9
+++ insserv	17 Dec 2003 14:55:47 -0000	1.10
@@ -30,6 +30,7 @@
 			bzcat $DL_DIR/src/insserv-core.diff.bz2 | patch -p1 || exit 1
 			touch .patch.done
 		fi
+		make clean
 		make $PMAKE all ||  exit 1
 		strip_debug
 

Index: linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/linux,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- linux	22 Nov 2003 02:04:45 -0000	1.45
+++ linux	17 Dec 2003 14:55:47 -0000	1.46
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       linux
-# Required-Start: $basebuildtools $libs pptp-patches grsecurity xfsprogs LVM patch-o-matic freeswan bridge-utils lm_sensors iproute2 watchdog MOSKRN
+# Required-Start: $basebuildtools $libs pptp-patches grsecurity xfsprogs LVM patch-o-matic super-freeswan bridge-utils lm_sensors iproute2 watchdog MOSKRN pcwd usbat-02
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:

Index: lm_sensors
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- lm_sensors	2 Dec 2003 16:13:41 -0000	1.8
+++ lm_sensors	17 Dec 2003 14:55:47 -0000	1.9
@@ -30,59 +30,64 @@
 
 case $1 in
 	build )
-		echo preparing patch
-		cd mkpatch || exit 1
-		./mkpatch.pl ../ $KERNELDIR | patch -p1 -d $KERNELDIR || exit 1
-		cd .. || exit 1
-		for CFG in $(  grep dep_tristate $KERNELDIR/drivers/sensors/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
-			echo "$CFG=m" >> $KERNELDIR/.config
-		done
-		for CFG in $(  grep bool $KERNELDIR/drivers/sensors/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
-			echo "$CFG=y" >> $KERNELDIR/.config
-		done
-		for CFG in $(  grep dep_tristate $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
-			echo "$CFG=m" >> $KERNELDIR/.config
-		done
-		for CFG in $(  grep bool $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
-			echo "$CFG=y" >> $KERNELDIR/.config
-		done
+		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
+			for CFG in $(  grep tristate $KERNELDIR/drivers/sensors/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+				echo "$CFG=m" >> $KERNELDIR/.config
+			done
+			for CFG in $(  grep bool $KERNELDIR/drivers/sensors/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+				echo "$CFG=y" >> $KERNELDIR/.config
+			done
+			for CFG in $(  grep tristate $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+				echo "$CFG=m" >> $KERNELDIR/.config
+			done
+			for CFG in $(  grep bool $KERNELDIR/drivers/i2c/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+				echo "$CFG=y" >> $KERNELDIR/.config
+			done
 
-		OLDDIR=$(pwd)
-		cd $KERNELDIR || exit 1
-		yes "" | make oldconfig
-		make dep || exit 1
-		cd $OLDDIR || exit 1
+			OLDDIR=$(pwd)
+			cd $KERNELDIR || exit 1
+			yes "" | make oldconfig
+			make dep || exit 1
+			cd $OLDDIR || exit 1
 
-		SMP=0
-		test "$CONFIG_LINUX_SMP" = "y" && SMP=1
+			SMP=0
+			test "$CONFIG_LINUX_SMP" = "y" && SMP=1
 
-		make user $PMAKE PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 || exit 1
-		strip_debug
+			make user $PMAKE PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 || exit 1
+
+			strip_debug
+		fi
 		;;
 
 	install )
-		rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
-		make install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man || exit 1
-		#make install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 I2C_HEADERS=$KERNELDIR/include/linux LINUX=$KERNELDIR|| exit 1
+		if [ "$CONFIG_LM_SENSORS" = "y" ]; then
+			rm -rf $WORKDIR/tmp || exit 1
+			mkdir -p $WORKDIR/tmp/usr/sbin || exit 1
+			make install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man || exit 1
+			#make install DESTDIR=$WORKDIR/tmp PREFIX=/usr SMP=$SMP MANDIR=/usr/share/man COMPILE_KERNEL=0 I2C_HEADERS=$KERNELDIR/include/linux LINUX=$KERNELDIR|| exit 1
 
-		copy_docs $WORKDIR/tmp
-		mkdir -p $DOCDIR/lm_sensors || exit 1
-		cp -dpR doc/* $DOCDIR/lm_sensors || exit 1
+			copy_docs $WORKDIR/tmp
+			mkdir -p $DOCDIR/lm_sensors || exit 1
+			cp -dpR doc/* $DOCDIR/lm_sensors || exit 1
 
-		cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
+			cp $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
 
-		rm -rf $WORKDIR/tmp/usr/include || exit 1
-		rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
-		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-		rm -rf $WORKDIR/tmp || exit 1
-		
-		cp $MYDIR/scripts/lm_sensors $ETCDIR/etc/init.d || exit 1
+			rm -rf $WORKDIR/tmp/usr/include || exit 1
+			rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
+			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
+			rm -rf $WORKDIR/tmp || exit 1
 
-        	echo "# Start lm_sensors?" >> $CONFIGFILE
-	        echo "START_LM_SENSORS=no" >> $CONFIGFILE
-		echo >> $CONFIGFILE
-		echo "HELP_$MYNAME=\"$MYNAME are the necessary modules to monitor the fan, temp... of your system\"" >> $SOFTWAREHELP
+			cp $MYDIR/scripts/lm_sensors $ETCDIR/etc/init.d || exit 1
+
+			echo "# Start lm_sensors?" >> $CONFIGFILE
+			echo "START_LM_SENSORS=no" >> $CONFIGFILE
+			echo >> $CONFIGFILE
+			echo "HELP_$MYNAME=\"$MYNAME are the necessary modules to monitor the fan, temp... of your system\"" >> $SOFTWAREHELP
+		fi
 		;;
 
 	* )

Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- patch-o-matic	13 Oct 2003 17:36:09 -0000	1.9
+++ patch-o-matic	17 Dec 2003 14:55:47 -0000	1.10
@@ -31,34 +31,37 @@
 	echo "no extra patches" > $WORKDIR/netfilter.patches.lst
 	if [ "$CONFIG_NF_PENDING" = "y" ]; then
 		export KERNEL_DIR=$KERNELDIR
-		yes "n" | ./runme --batch submitted
-		yes "n" | ./runme --batch pending
-		yes "n" | ./runme --batch optimizations
+		./runme --batch submitted || exit 1
+		./runme --batch pending || exit 1
+		./runme --batch optimizations || exit 1
 		if [ "$CONFIG_NF_BASE" = "y" ]; then
-			yes "n" | ./runme --batch base
+			./runme --batch base
 		fi
 		if [ "$CONFIG_NF_EXTRA" = "y" ]; then
-			yes "n" | ./runme --batch $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)
+			./runme --batch $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra) || exit 1
 		fi
-		for CFG in $(  grep dep_tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+		for CFG in $(  grep tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=m" >> $KERNELDIR/.config
 		done
 		for CFG in $(  grep bool $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=y" >> $KERNELDIR/.config
 		done
-		for CFG in $(  grep dep_tristate $KERNELDIR/net/ipv6/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
+		for CFG in $(  grep tristate $KERNELDIR/net/ipv6/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=m" >> $KERNELDIR/.config
 		done
 		for CFG in $(  grep bool $KERNELDIR/net/ipv6/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=y" >> $KERNELDIR/.config
 		done
+
+		# settings didn't get applied, so let's do it here
+		echo "CONFIG_IP_NF_RAW=m"  >> $KERNELDIR/.config
+
 		echo "**** IPv4 ****" > $WORKDIR/netfilter.patches.lst
-		grep dep_tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst
+		grep tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst
 		pushd $KERNEL_DIR > /dev/null
 		echo "" >> $WORKDIR/netfilter.patches.lst
 		echo "**** IPv6 ****" >> $WORKDIR/netfilter.patches.lst
-		grep dep_tristate $KERNELDIR/net/ipv6/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst
-		#yes "" |
+		grep tristate $KERNELDIR/net/ipv6/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst
 		make oldconfig || exit 1
 		popd > /dev/null
 	fi

Index: pcmcia-cs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pcmcia-cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pcmcia-cs	13 Oct 2003 17:36:09 -0000	1.10
+++ pcmcia-cs	17 Dec 2003 14:55:47 -0000	1.11
@@ -30,15 +30,11 @@
 case $1 in
     build )
 	if [ "$CONFIG_PCMCIA_CS" = "y" ]; then
-		echo "LINUX=$KERNELDIR" >> config.in
-		echo "CONFIG_PNP=y" >> config.in
-		echo "CONFIG_CARDBUS=y" >> config.in
-		echo "CONF_SRC=2" >> config.in
-		make oldconfig
+		./Configure --kernel=$KERNELDIR --noprompt --notrust --cardbus --pnp --apm --nox11 --srctree --sysv --nox11 --rcdir=/etc/init.d || exit 1
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
-		     #echo "KFLAGS=\"-fno-stack-protector\"" >> config.mk
 		     echo "CPPFLAGS += -fno-stack-protector" >> config.mk
 		fi
+		echo "SYSV_INIT=y" >> ./config.out
 		make $PMAKE all || exit 1
 		strip_debug
 	fi
@@ -56,7 +52,7 @@
 		replace_str $ETCDIR/etc/sysconfig/pcmcia "PCMCIA=yes" "PCMCIA=no"
 		rm $ETCDIR/etc/sysconfig/pcmcia.old
 		cp $MYDIR/scripts/pcmcia $ETCDIR/etc/init.d/ || exit 1
-		cat $WORKDIR/tmp/etc/rc.d/init.d/pcmcia >> $ETCDIR/etc/init.d/pcmcia || exit 1
+		cat etc/rc.pcmcia >> $ETCDIR/etc/init.d/pcmcia || exit 1
 
 		rm -rf $WORKDIR/tmp/etc || exit 1
 		cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1

Index: pcwd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pcwd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pcwd	13 Oct 2003 17:36:09 -0000	1.6
+++ pcwd	17 Dec 2003 14:55:47 -0000	1.7
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       pcwd
-# Required-Start: $basebuildtools $libs 
+# Required-Start: $basebuildtools $libs
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -24,9 +24,13 @@
 source $MYDIR/settings
 source $MYDIR/functions
 
+KERNELDIR=$(find_src_dir linux)
+
 case $1 in
 	build )
 		if [ "$CONFIG_WATCHDOG_PCWD" = "y" ]; then
+			# update the kernel driver first
+			cp pcwd.c $KERNELDIR/drivers/char/ || exit 1
 			make $PMAKE || exit 1
 			strip_debug
 		fi

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- prepare	1 Nov 2003 18:35:58 -0000	1.29
+++ prepare	17 Dec 2003 14:55:47 -0000	1.30
@@ -87,6 +87,8 @@
 
 	cp $MYDIR/config/config_linux $KERNELDIR/.config || exit 1
 	echo "CONFIG_M$CONFIG_KERNEL_CPU=y" >> $KERNELDIR/.config
+	echo "CONFIG_NR_CPUS=$CONFIG_LINUX_NR_CPUS" >> $KERNELDIR/.config
+
 	if [ "$CONFIG_LINUX_SMP" == "y" ]; then
 		cat $DL_DIR/scripts/config/config_linux.smp  >> $KERNELDIR/.config || exit 1
 	else
@@ -98,7 +100,7 @@
 	else
 		cat $DL_DIR/scripts/config/config_highmem.no >> $KERNELDIR/.config || exit 1
 	fi
-	
+
 	if [ "$CONFIG_KERNEL_CPU" == "VIAC3_2" ]; then
 		cat $DL_DIR/scripts/config/config_linux.epia >> $KERNELDIR/.config || exit 1
 	elif [ "$CONFIG_KERNEL_CPU" == "486" ]; then
@@ -110,7 +112,7 @@
 	if [ "$CONFIG_ALSA" == "y" ]; then
 		cat $DL_DIR/scripts/config/config_linux.alsa >> $KERNELDIR/.config || exit 1
 	fi
-	
+
 	pushd $KERNELDIR > /dev/null
 
 	if [ ! -f devil-linux-kernel-patches.done ]; then






[Devil-linux-commit] build/scripts quota-tools,NONE,1.1 super-freeswan,NONE,1.1 usbat-02,NONE,1.1 bu

[Devil-linux-commit] build/scripts quota-tools,NONE,1.1 super-freeswan,NONE,1.1 usbat-02,NONE,1.1 build.sh,1.60,1.61 ebtables,1.2,1.3 functions,1.41,1.42 i2c,1.2,1.3 insserv,1.9,1.10 linux,1.45,1.46 lm_sensors,1.8,1.9 patch-o-matic,1.9,1.10 pcmcia-cs,1.10,1.11 pcwd,1.6,1.7 prepare,1.29,1.30