Changeset 47fddc8 for Config.in

Timestamp:

08/12/2006 07:59:11 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

3fa20d4

Parents:

54f4782

Message:

Change bool parameter definitions from 0/1 to y/n to match the new menu app

File:

• Config.in (modified) (9 diffs)

Config.in

@@ -337 +337 @@
                         #-- The directory where the created system will be located.
 
-        config  CONFIG_GETPKG
+        config  GETPKG
                 bool "Retrieve source files"
                 default n
@@ -349 +349 @@
                 string "Package Archive Directory"
                 default "$SRC_ARCHIVE"
-                depends CONFIG_GETPKG
+                depends GETPKG
                 help
                         #-- A local archive for packages/file (not $BUILDDIR/sources)
@@ -356 +356 @@
                         #   if the user has the right priviledges.
 
-        config  CONFIG_GETKERNEL
+        config  GETKERNEL
                 bool    "Always retrieve kernel package"
                 default n
-                depends CONFIG_GETPKG
+                depends GETPKG
                 help
                         #-- Get the kernel package and patches even if no configuration
                         #   file has been supplied.
 
-        config  CONFIG_RUNMAKE
+        config  RUNMAKE
                 bool    "Run the makefile"
                 default n
@@ -370 +370 @@
                         #-- Automatically run the makefile once it has been created
 
-        config  CONFIG_REBUILD
+        config  CLEAN
                 bool    "Rebuild files"
                 default n
@@ -431 +431 @@
                 default "3"     if TST_3
 
-        choice
+        choice  
                 prompt  "Flavour ->"
                 depends CONFIG_TESTS
-                default NO_BOMB
 
                 config  NO_BOMB
                         bool    "Don't stop on test suite failures"
+                        default n
 
                 config  BOMB
                         bool    "Abort the build at the first test suite failure"
+                        default n
         endchoice
 
         config  BOMB_TEST
-                int
-                default "0"     if NO_BOMB
-                default "1"     if BOMB
+                bool
+                default BOMB
+
         #--- End Test Suites
 
@@ -495 +496 @@
         #--- End Kernel
 
-        config  CONFIG_STRIP
+        config  STRIP
                 bool "Strip Installed Binaries/Libraries"
                 default y
 
-        config  CONFIG_VIMLANG
+        config  VIMLANG
                 bool "Install vim-lang package"
                 default y
@@ -550 +551 @@
 menu "--- Advanced Features"
 
-        config  CONFIG_REPORT
+        config  REPORT
                 bool "Create SBU and disk usage report"
                 default y
 
         #--- ICA/farce
-        config  CONFIG_COMPARE
+        config  COMPARE
                 bool "Run comparison analysis on final stage"
                 depends !BOOK_CLFS2
@@ -575 +576 @@
 
         config  ITERATIONS
-                int     "Number of test runs (2,3,4,5)"
-                depends on CONFIG_COMPARE
+                int     "Number of test runs (2,3,4,5)" if COMPARE
+                depends on COMPARE
                 range   2 5
                 default 3
 
-        config  CONFIG_ICA
+        config  RUN_ICA
                 bool    "ICA testing"
-                depends on CONFIG_COMPARE
+                depends on COMPARE
                 default y
                 help
                         #-- Run ICA testing
 
-        config  CONFIG_FARCE
+        config  RUN_FARCE
                 bool    "farce testing"
-                depends on CONFIG_COMPARE
+                depends on COMPARE
                 default n
                 help
@@ -648 +649 @@
 
 
-# convert CONFIG_XXXX n/y to XXXX 0/1
-
-        config  COMPARE
-                int
-                default 0       if !CONFIG_COMPARE
-                default 1       if  CONFIG_COMPARE
-
-        config  GETPKG
-                int
-                default 0       if !CONFIG_GETPKG
-                default 1       if  CONFIG_GETPKG
-
-        config  GETKERNEL
-                int
-                default 0       if !CONFIG_GETKERNEL
-                default 1       if  CONFIG_GETKERNEL
-
-        config  RUNMAKE
-                int
-                default 0       if !CONFIG_RUNMAKE
-                default 1       if  CONFIG_RUNMAKE
-
-        config  STRIP
-                int
-                default 0       if !CONFIG_STRIP
-                default 1       if  CONFIG_STRIP
-
-        config  REPORT
-                int
-                default 0       if !CONFIG_REPORT
-                default 1       if  CONFIG_REPORT
-
-        config  VIMLANG
-                int
-                default 0       if !CONFIG_VIMLANG
-                default 1       if  CONFIG_VIMLANG
-
-        config  RUN_ICA
-                int
-                default 0       if !CONFIG_ICA
-                default 1       if  CONFIG_ICA
-
-        config  RUN_FARCE
-                int
-                default 0       if !CONFIG_FARCE
-                default 1       if  CONFIG_FARCE
-
-        config  CLEAN
-                int
-                default 0       if !CONFIG_REBUILD
-                default 1       if  CONFIG_REBUILD