[Devil-linux-commit] build/scripts/configuration prepare.config, 1.29, 1.30

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

Update of /cvsroot/devil-linux/build/scripts/configuration
In directory vz-cvs-3.sog:/tmp/cvs-serv25792

Modified Files:
	prepare.config 
Log Message:
cleanup - we don't support these options anymore


Index: prepare.config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/prepare.config,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- prepare.config	2 Nov 2011 14:03:42 -0000	1.29
+++ prepare.config	3 Dec 2011 09:26:29 -0000	1.30
@@ -8,9 +8,6 @@
 test -z "$CONFIG_KERNEL_CPU" && CONFIG_KERNEL_CPU=486
 test -z "$CONFIG_CPU" && CONFIG_CPU=486
 test -z "$CONFIG_GCC_CPU" && CONFIG_CPU=486
-test -z "$CONFIG_VHZ" && CONFIG_VHZ=OFF
-test -z "$CONFIG_PSCHED_CLOCK_SOURCE" && CONFIG_PSCHED_CLOCK_SOURCE=PSCHED_JIFFIES
-test "$CONFIG_KERNEL_CPU" != "686" -a "$CONFIG_KERNEL_CPU" != "VIAC3_2" -a "$CONFIG_PSCHED_CLOCK_SOURCE" = "PSCHED_CPU" && CONFIG_PSCHED_CLOCK_SOURCE=PSCHED_JIFFIES
 
 menu_add "Build Configuration|Size Optimization" bool "Compressed ISO (ZISOFS)" CONFIG_ZISOFS
 menu_add "Build Configuration|Size Optimization" bool "Compressed image (SQUASHFS)" CONFIG_SQUASHFS
@@ -25,21 +22,9 @@
 test -z "$CONFIG_PARALLEL_JOBS" && CONFIG_PARALLEL_JOBS=1
 menu_add "Build Configuration" list "Parallel Jobs" CONFIG_PARALLEL_JOBS 1 2 3 4 5 6 7 8 9 10
 
-test -z "$CONFIG_NICE" && CONFIG_NICE=y
-menu_add "Build Configuration" bool "Run build with nice" CONFIG_NICE
-
-menu_add "Build Configuration" bool "Disable Build system logfiles" CONFIG_DISABLELOGGING
-
 test -z "$CONFIG_INITRD_FS" && CONFIG_INITRD_FS=EXT2
 menu_add "Build Configuration" list "InitRD Filesystem" CONFIG_INITRD_FS EXT2 INITRAMFS
 
-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
-else
-	menu_add "Build Configuration|Processor and Memory" list "PSCHED_CLOCK_SOURCE" CONFIG_PSCHED_CLOCK_SOURCE PSCHED_GETTIMEOFDAY PSCHED_JIFFIES
-fi
-
-
 # Options from gcc v3.2.3
 # i386,  i486,  i586,  i686,
 # pentium, pentium-mmx,  pentiumpro,  pentium2,  pentium3,  pentium4,