[Devil-linux-commit] build/scripts patch-o-matic,1.15,1.16

[Friedrich L. <fr...@us...>]

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

Modified Files:
	patch-o-matic 
Log Message:
next try in getting it right


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- patch-o-matic	9 Apr 2004 21:47:40 -0000	1.15
+++ patch-o-matic	10 Apr 2004 09:20:02 -0000	1.16
@@ -31,12 +31,13 @@
 		NETFILTERDIR=$(find_src_dir iptables)
 		export NETFILTERDIR
 
-		# move troublesome patches away
-		mkdir -p submitted/tmp
-		mkdir -p pending/tmp
-		mkdir -p base/tmp
-		mv -f submitted/61_nulldev_alignment* submitted/tmp &> /dev/null
-		mv -f base/connlimit* base/tmp &> /dev/null
+		# move away troublesome patches, which can not be 
+		# excluded otherwise
+		#mkdir -p submitted/tmp
+		#mkdir -p pending/tmp
+		#mkdir -p base/tmp
+		#mv -f submitted/61_nulldev_alignment* submitted/tmp &> /dev/null
+		#mv -f base/connlimit* base/tmp &> /dev/null
 		#mv -f pending/XXXXX* pending/tmp &> /dev/null
 
 		PATCHES=""; 
@@ -45,8 +46,11 @@
 		[ "$CONFIG_NF_EXTRA" = "y" ] && \
 			PATCHES="$PATCHES $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)"
 
-		# now apply all patches at once
+		# now apply all patches at once and taking care 
+		# to exclude troublesome patches
 		./runme --batch \
+			--exclude base/connlimit \
+			--exclude submitted/61_nulldev_alignment \
 			submitted \
 			pending \
 			optimizations \