[Devil-linux-commit] build/scripts iproute2,1.24,1.25

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

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

Modified Files:
	iproute2 
Log Message:
- updated acl to 2.2.32
- updated attr to 2.4.24
- updated bind to 9.3.1
- updated bison to 2.1
- updated iproute2 to 051007
- updated less to 382
- updated openswan to 2.4.2dr2
- updated openvpn to 2.0.2
- updated pci.ids
- updated pciutils to 2.2.0
- updated usb.ids
- updated usbutils to 0.71
- updated vim to 6.4
- updated xfsprogs to 2.7.3


Index: iproute2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- iproute2	29 Dec 2004 03:14:27 -0000	1.24
+++ iproute2	17 Oct 2005 19:16:16 -0000	1.25
@@ -28,14 +28,14 @@
 case $1 in
 	build )
 		if [ "$CONFIG_IPROUTE2" = "y" ]; then
-			if [ ! -f devil-linux-patches.done ]; then
-			    touch devil-linux-patches.done
-			    zcat $DL_DIR/src/iproute_*.diff.gz | patch -p1 || exit 1
-			    bzcat $DL_DIR/src/iproute2-*.patch.bz2 | patch -p1 || exit 1
-			fi
+			#if [ ! -f devil-linux-patches.done ]; then
+			#    touch devil-linux-patches.done
+			#    zcat $DL_DIR/src/iproute_*.diff.gz | patch -p1 || exit 1
+			#fi
 			replace_str Makefile /usr/src/linux $KERNELDIR
 			replace_str Config "TC_CONFIG_ATM=y" "TC_CONFIG_ATM=n"
 
+			old_kernel_includes
 			make $PMAKE all || exit 1
 			strip_debug
 		fi