[Devil-linux-commit] build/scripts patch-o-matic,1.17,1.18

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

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

Modified Files:
	patch-o-matic 
Log Message:
hope that this really fixes the problem with iptables failing to compile


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- patch-o-matic	10 Apr 2004 15:16:14 -0000	1.17
+++ patch-o-matic	11 Apr 2004 00:07:49 -0000	1.18
@@ -31,25 +31,27 @@
 		NETFILTERDIR=$(find_src_dir iptables)
 		export NETFILTERDIR
 
-		# 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=""; 
-		[ "$CONFIG_NF_BASE" = "y" ] && \
+		EXCLUDE_PATCHES="";
+
+		# patchs to exclude, eg. because of creating troubles
+		EXCLUDE_PATCHES="submitted/61_nulldev_alignment"
+
+		if [ "$CONFIG_NF_BASE" = "y" ]; then
+			EXCLUDE_PATCHES="$EXCLUDE_PATCHES base/set"
 			PATCHES="$PATCHES base";
+		fi
 		[ "$CONFIG_NF_EXTRA" = "y" ] && \
 			PATCHES="$PATCHES $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)"
 
+		# reformat to fit as commandline option to runme
+		EXCLUDE=""; for P in $EXCLUDE_PATCHES; do 
+			EXCLUDE="$EXCLUDE --exclude $P"; done
+
 		# now apply all patches at once and taking care 
 		# to exclude troublesome patches
 		./runme --batch \
-			--exclude submitted/61_nulldev_alignment \
+			$EXCLUDE \
 			submitted \
 			pending \
 			optimizations \