[Devil-linux-commit] build/scripts patch-o-matic,1.38,1.39

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22318/scripts

Modified Files:
	patch-o-matic 
Log Message:

- update p-o-m. 


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- patch-o-matic	23 Oct 2008 03:01:34 -0000	1.38
+++ patch-o-matic	24 Feb 2009 22:39:46 -0000	1.39
@@ -46,7 +46,11 @@
 #			patch -p1 < ../netfilter-layer7-*/iptables-1.4.1*2.6.20forward-layer7*.patch || exit 1
 			cp -a ../netfilter-layer7-*/iptables-1.4.1.*-2.6.20forward/* extensions/
 #		        chmod +x extensions/.layer7-test || exit 1
+
+			# otherwise p-o-m doesn't recognize iptables sources
+			./configure
             		popd > /dev/null
+
 			touch $KERNEL_DIR/.done_layer7
 		    fi
 		fi
@@ -77,18 +81,22 @@
 			EXCLUDE="$EXCLUDE --exclude ${P##*/}"
 		done
 			
-		[ "$CONFIG_NF_UPDATES" = "y" ] && \
-			yes "" | ./runme --batch updates
-		
-		[ "$CONFIG_NF_PENDING" = "y" ] && \
-			yes "" | ./runme --batch pending $EXCLUDE
-
-		[ "$CONFIG_NF_BASE" = "y" ] && \
-			yes "" | ./runme --batch base $EXCLUDE
+#		[ "$CONFIG_NF_UPDATES" = "y" ] && \
+#			yes "" | ./runme --batch updates
+#		
+#		[ "$CONFIG_NF_PENDING" = "y" ] && \
+#			yes "" | ./runme --batch pending $EXCLUDE
+#
+#		[ "$CONFIG_NF_BASE" = "y" ] && \
+#			yes "" | ./runme --batch base $EXCLUDE
+#
+#		[ "$CONFIG_NF_EXTRA" = "y" ] && \
+#			yes "" | ./runme --batch extra $EXCLUDE
 
-		[ "$CONFIG_NF_EXTRA" = "y" ] && \
-			yes "" | ./runme --batch extra $EXCLUDE
+		[ "$CONFIG_NF_EXTERNAL" = "y" ] && \
+			yes "" | ./runme --batch external $EXCLUDE
 
+		set_all_kernel_options net/netfilter
 		set_all_kernel_options net/ipv4/netfilter
 		set_all_kernel_options net/ipv6/netfilter