[Devil-linux-commit] build/scripts prepare,1.52,1.53

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

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

Modified Files:
	prepare 
Log Message:
some more separation in kernel config
enabled all netfilter related settings in prepare script


Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- prepare	30 Dec 2004 23:57:26 -0000	1.52
+++ prepare	31 Dec 2004 00:20:54 -0000	1.53
@@ -142,32 +142,9 @@
 		fi
 	fi
 
-	if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-		mv $KERNELDIR/include/net/pkt_sched.h $KERNELDIR/include/net/pkt_sched.h.old || exit 1
-		sed -e "s/#define PSCHED_CLOCK_SOURCE	PSCHED_JIFFIES/#define PSCHED_CLOCK_SOURCE	$CONFIG_PSCHED_CLOCK_SOURCE/g" $KERNELDIR/include/net/pkt_sched.h.old > $KERNELDIR/include/net/pkt_sched.h || exit 1
-	fi
-	if [ ! "$CONFIG_VHZ" = "OFF" ] && [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-		if [ ! -f devil-linux-vhz-patch.done ]; then
-			echo applying vhz patches 
-			bzcat $DL_DIR/src/vhz-j64*.patch.bz2 | patch -p1 || exit 1
-			bzcat $DL_DIR/src/vhz-param.patch.bz2 | patch -p1 || exit 1
-			touch devil-linux-vhz-patch.done
-		fi
-
-		echo "CONFIG_HZ=$CONFIG_VHZ" >> $KERNELDIR/.config
-
-	fi
-
 	case "$CONFIG_LINUX_POWER_MGMT" in
-	    APM ) 
-		set_kernel_option CONFIG_PM y
-		set_kernel_option CONFIG_APM m
-		set_kernel_option CONFIG_ACPI n
-		;;
-	    ACPI ) 
-		set_kernel_option CONFIG_PM y
-		set_kernel_option CONFIG_APM n
-		set_kernel_option CONFIG_ACPI y
+	    APM | ACPI )
+		cat $KERNEL_CONFIG_DIR/config_linux.$CONFIG_LINUX_POWER_MGMT >> $KERNELDIR/.config || exit 1
 		;;
 	    *)
 		set_kernel_option CONFIG_PM n
@@ -175,6 +152,12 @@
 		set_kernel_option CONFIG_ACPI n
 		;;
 	esac
+	
+	# make sure all netfilter modules are enabled
+	set_all_kernel_options net/bridge/netfilter
+	set_all_kernel_options net/ipv4/netfilter
+	set_all_kernel_options net/ipv6/netfilter
+					 
 
 	make oldconfig || exit 1
 	if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then