[Devil-linux-commit] build/scripts/configuration patch-o-matic.config,1.5,1.6 prism54.config,1.2,1.3

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

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

Modified Files:
	patch-o-matic.config prism54.config 
Log Message:
- more changes to the build system to get everything working in with kernel
2.6
- replaced patch-o-matic with patch-o-matic-ng v20040704
- updated iptables to v1.2.11
- use kernel prism54 driver on kernel 2.6


Index: patch-o-matic.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/patch-o-matic.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- patch-o-matic.config	14 Apr 2004 02:39:38 -0000	1.5
+++ patch-o-matic.config	11 Jul 2004 14:35:25 -0000	1.6
@@ -5,20 +5,19 @@
 #
 # http://www.devil-linux.org
 
-[ "$CONFIG_LINUX_VERSION" = "2.4" ] && 
+#[ "$CONFIG_LINUX_VERSION" = "2.4" ] && 
 	menu_add "Networking|Firewall" bool "Netfilter patches" CONFIG_NF_PATCHES
 
 if [ "$CONFIG_NF_PATCHES" = "y" ]; then
-	menu_add "Networking|Firewall" bool "Netfilter submitted patches" CONFIG_NF_SUBMITTED
+	menu_add "Networking|Firewall" bool "Netfilter 'submitted' patches" CONFIG_NF_SUBMITTED
+	menu_add "Networking|Firewall" bool "Netfilter 'updates' patches" CONFIG_NF_UPDATES
 
 	[ "$CONFIG_NF_SUBMITTED" = "y" ] && 
-		menu_add "Networking|Firewall" bool "Netfilter pending patches" CONFIG_NF_PENDING
+		menu_add "Networking|Firewall" bool "Netfilter 'pending' patches" CONFIG_NF_PENDING
 
 	if [ "$CONFIG_NF_SUBMITTED" = "y" ] && [ "$CONFIG_NF_PENDING" = "y" ]; then
-		menu_add "Networking|Firewall" bool "Netfilter base patches" CONFIG_NF_BASE
-
-		menu_add "Networking|Firewall" bool "Netfilter optimization patches (causes problems)" CONFIG_NF_OPTIMIZATION
+		menu_add "Networking|Firewall" bool "Netfilter 'base' patches" CONFIG_NF_BASE
 
-		menu_add "Networking|Firewall" bool "Netfilter extra patches" CONFIG_NF_EXTRA
+		menu_add "Networking|Firewall" bool "Netfilter 'extra' patches" CONFIG_NF_EXTRA
 	fi
 fi

Index: prism54.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/prism54.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- prism54.config	31 Dec 2003 02:41:18 -0000	1.2
+++ prism54.config	11 Jul 2004 14:35:25 -0000	1.3
@@ -5,4 +5,6 @@
 #
 # http://www.devil-linux.org
 
-menu_add "System|Hardware Support" bool "Prism54 based Chipsets and Wireless cards" CONFIG_PRISM54
+if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+    menu_add "System|Hardware Support" bool "Prism54 based Chipsets and Wireless cards" CONFIG_PRISM54
+fi