[Devil-linux-commit] build/scripts/configuration linux.config,1.13,1.14 prepare.config,1.14,1.15

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

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

Modified Files:
	linux.config prepare.config 
Log Message:
- updated popt to v1.7
- don't install hostname from coreutils package, use the one from net-tools
- added frandom patch to kernel
- added ssp guard functions + frandom support to glibc
- removed support for kernel 2.4 from build system
- updated gcc-protector to v3.4.1-1


Index: prepare.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/prepare.config,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- prepare.config	11 Apr 2004 00:21:57 -0000	1.14
+++ prepare.config	23 Sep 2004 21:50:02 -0000	1.15
@@ -28,9 +28,9 @@
 test -z "$CONFIG_INITRD_FS" && CONFIG_INITRD_FS=CRAMFS
 menu_add "Build Configuration" list "InitRD Filesystem" CONFIG_INITRD_FS CRAMFS EXT2
 
-if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-	menu_add "Build Configuration|Processor and Memory" list "Variable HZ" CONFIG_VHZ OFF 100 200 250 400 500 750 800 1000
-fi
+#if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+#	menu_add "Build Configuration|Processor and Memory" list "Variable HZ" CONFIG_VHZ OFF 100 200 250 400 500 750 800 1000
+#fi
 
 if [ "$CONFIG_KERNEL_CPU" = "686" -o "$CONFIG_KERNEL_CPU" = "VIAC3_2" ]; then
 	menu_add "Build Configuration|Processor and Memory" list "PSCHED_CLOCK_SOURCE" CONFIG_PSCHED_CLOCK_SOURCE PSCHED_GETTIMEOFDAY PSCHED_JIFFIES PSCHED_CPU

Index: linux.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/linux.config,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- linux.config	30 Aug 2004 18:07:07 -0000	1.13
+++ linux.config	23 Sep 2004 21:50:02 -0000	1.14
@@ -7,9 +7,9 @@
 
 test -z "$CONFIG_LINUX_POWER_MGMT" && CONFIG_LINUX_POWER_MGMT=OFF
 test -z "$CONFIG_LINUX_NR_CPUS" && CONFIG_LINUX_NR_CPUS=4
-test -z "$CONFIG_LINUX_VERSION" && CONFIG_LINUX_VERSION=2.4
+test -z "$CONFIG_LINUX_VERSION" && CONFIG_LINUX_VERSION=2.6
 menu_add "Build Configuration|Processor and Memory" bool "Symmetric multi-processing support" CONFIG_LINUX_SMP
 menu_add "Build Configuration|Processor and Memory" list "Maximum number of CPUs" CONFIG_LINUX_NR_CPUS 2 4 8 16 32
-menu_add "Build Configuration" list "Kernel Version" CONFIG_LINUX_VERSION 2.4 2.6
+menu_add "Build Configuration" list "Kernel Version" CONFIG_LINUX_VERSION 2.6
 test "$CONFIG_LINUX_VERSION" = "2.6" &&  menu_add  "Build Configuration" list "Power Management" CONFIG_LINUX_POWER_MGMT OFF APM ACPI
-test "$CONFIG_LINUX_VERSION" = "2.4" &&  menu_add  "Build Configuration" list "Power Management" CONFIG_LINUX_POWER_MGMT OFF APM
+#test "$CONFIG_LINUX_VERSION" = "2.4" &&  menu_add  "Build Configuration" list "Power Management" CONFIG_LINUX_POWER_MGMT OFF APM