[Devil-linux-commit] build/scripts ebtables,NONE,1.1 bridge-utils,1.12,1.13

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

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

Modified Files:
	bridge-utils 
Added Files:
	ebtables 
Log Message:
added ebtables and removed old bridge-netfilter patch


--- NEW FILE: ebtables ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/ebtables,v $
# $Revision: 1.1 $
# $Date: 2003/11/15 01:52:06 $
#
# http://www.devil-linux.org

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

### BEGIN INIT INFO
# Provides:       ebtables
# 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=BRIDGE_UTILS

case $1 in
	build )
		if [ "$CONFIG_EBTABLES" = "y" ]; then
			FLAGS="-Wall -Wunused"
			if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
				FLAGS="$FLAGS -fno-stack-protector"
			fi
			make MANDIR=/usr/share/man CFLAGS="$FLAGS" $PMAKE all|| exit 1
			strip_debug
			KERNELDIR=$(find_src_dir linux)
			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
				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
				echo "$CFG=y" >> $KERNELDIR/.config
			done

			echo "CONFIG_IP_NF_MATCH_PHYSDEV=m" >> $KERNELDIR/.config
		fi
		;;

	install )
		if [ "$CONFIG_EBTABLES" = "y" ]; then
			make install MANDIR=$CDDIR/usr/share/man ETHERTYPESPATH=$ETCDIR/etc BINPATH=$CDDIR/sbin/ || exit 1
		fi
	;;

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

Index: bridge-utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bridge-utils,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bridge-utils	13 Oct 2003 17:36:07 -0000	1.12
+++ bridge-utils	15 Nov 2003 01:52:06 -0000	1.13
@@ -32,14 +32,6 @@
 		./configure --prefix=/usr || exit 1
 		make $PMAKE all|| exit 1
 		strip_debug
-		KERNELDIR=$(find_src_dir linux)
-		if [ "$CONFIG_BRIDGE_NETFILTER" = "y" ]; then
-			bzcat $DL_DIR/src/bridge-nf-*.diff.bz2 | patch -p 1 -d $KERNELDIR || exit 1
-			# update kernel config
-			echo "CONFIG_BRIDGE_NF=y" >> $KERNELDIR/.config
-		else
-			echo "CONFIG_BRIDGE_NF=n" >> $KERNELDIR/.config
-		fi
 	fi
 		;;