Changeset 5130b3a for Config.in

Timestamp:

11/17/2013 10:20:07 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

dda2496

Parents:

84a651c

Message:

Merge trunk r3750-3760

File:

• Config.in (modified) (18 diffs)

Config.in

@@ -22 +22 @@
 #               config  BOOK_HLFS
 #                       bool "Hardened Linux From Scratch"
-
-#               config  BOOK_BLFS
-#                       bool "Beyond Linux From Scratch"
         endchoice
 
@@ -34 +31 @@
                 default "clfs3"         if BOOK_CLFS3
                 default "hlfs"          if BOOK_HLFS
-#               default "blfs"          if BOOK_BLFS
 
         config  RUN_ME
                 string
-                default "./jhalfs run"# if !BOOK_BLFS
-#               default "./blfs-tool"   if BOOK_BLFS
+                default "./jhalfs run"
         #--- End BOOK/script
 
@@ -61 +56 @@
                 config  WORKING_COPY
                         bool    "Working Copy"
-#                       depends on !BOOK_BLFS
                         help
                                 #-- A local working copy
@@ -260 +254 @@
 
                 default "powerpc-unknown-linux-gnu"     if  ARCH_PPC && DATA_32
-                default "powerpc64-unknown-linux-gnu"   if  ARCH_PPC && (DATA_MULTI || DATA-64)
+                default "powerpc64-unknown-linux-gnu"   if  ARCH_PPC && (DATA_MULTI || DATA_64)
 
                 default "sparc-unknown-linux-gnu"       if  ARCH_SPARC && DATA_32
@@ -429 +423 @@
                 default "2.4"           if KERNEL_24
 
-#         menu  "HLFS Additional Features"
-#               depends on BOOK_HLFS
-#
-#               config  SET_SSP
-#               bool    "Stack-smashing protector"
-#               default y
-#
-#               config  SET_ASLR
-#               bool    "Address-space layout randomization"
-#               default y
-#
-#               config  SET_PAX
-#               bool    "PaX-aware ELF executables and kernel"
-#               default y
-#
-#               config  SET_HARDENED_TMP
-#               bool    "Hardened temporary files creation"
-#               default y
-#
-#               config  SET_WARNINGS
-#               bool    "Additional warnings"
-#               default y
-#
-#               config  SET_MISC
-#               bool    "Miscellaneous features"
-#               default y
-#
-#               config  SET_BLOWFISH
-#               bool    "Blowfish passwords"
-#               default y
-#       endmenu
-
-        config  SSP
-#               depends on SET_SSP
-                string
-                default ",ssp,"
-
-        config  ASLR
-#               depends on SET_ASLR
-                string
-                default ",aslr,"
-
-        config  PAX
-#               depends on SET_PAX
-                string
-                default ",pax,"
-
-        config  HARDENED_TMP
-#               depends on SET_HARDENED_TMP
-                string
-                default ",hardened_tmp,"
-
-        config  WARNINGS
-#               depends on SET_WARNINGS
-                string
-                default ",warnings,"
-
-        config  MISC
-#               depends on SET_MISC
-                string
-                default ",misc,"
-
-        config  BLOWFISH
-#               depends on SET_BLOWFISH
-                string
-                default ",blowfish,"
-        #--- End HLFS specific params
-
         #--- Custom Tools support
         config CUSTOM_TOOLS
                 bool    "Add custom tools support"
                 default n
-#               depends on !BOOK_BLFS
                 help
                         #--- Activating this option additional packages you create
@@ -512 +437 @@
                 bool    "Add blfs-tool support"
                 default n
-#               depends on !BOOK_BLFS && !BOOK_CLFS3
                 depends on !BOOK_CLFS3
                 help
@@ -542 +466 @@
                                 #-- Current development version as in trunk
 
+                config  BLFS_WORKING_COPY
+                        bool    "BLFS working copy"
+                        help
+                                #-- A local working copy of the BLFS book.
+
                 config  BLFS_BRANCH
                         bool    "BLFS Branch or stable book"
@@ -548 +477 @@
         endchoice
 
+        config  BLFS_WC_LOCATION
+                string  "Location of the local BLFS working copy (mandatory)"
+                default "**EDIT ME**"
+                depends on BLFS_WORKING_COPY
+                help
+                        #-- Full path to the BLFS book working copy"
+
         config  BLFS_BRANCH_ID
                 string  "BLFS Book Version (mandatory)"
@@ -629 +565 @@
         config  BLFS_ROOT
                 string "Directory root"
-#               default "$HOME/blfs_root" if BOOK_BLFS
-                default "/blfs_root" if BLFS_TOOL
-#               depends on BOOK_BLFS || BLFS_TOOL
+                default "/blfs_root"
                 depends on BLFS_TOOL
                 help
@@ -640 +574 @@
                 string "BLFS sources directory"
                 default "blfs-xml"
-#               depends on BOOK_BLFS || BLFS_TOOL
                 depends BLFS_TOOL
                 help
@@ -649 +582 @@
                 string "Installed packages database directory"
                 default "/var/lib/jhalfs/BLFS"
-#               depends on BOOK_BLFS || BLFS_TOOL || CUSTOM_TOOLS
                 depends on BLFS_TOOL || CUSTOM_TOOLS
                 help
@@ -671 +603 @@
 
 menu "--- General Settings"
-#       depends on !BOOK_BLFS
 
         #--- Set User Account
@@ -817 +748 @@
 
 menu "--- Build Settings"
-#       depends on !BOOK_BLFS
 
         #--- Test Suites
@@ -1022 +952 @@
 
 menu "--- Advanced Features"
-#       depends on !BOOK_BLFS
 
         config  REPORT
@@ -1072 +1001 @@
 if !BOOK_CLFS2 && !BOOK_CLFS3
         config  CONFIG_OPTIMIZE
-                bool    "Use optimization (see help)"
-                default n
-                help
-                        #-- Actual optimization flags MUST be defined in ./optimize/*
-                        #   files before activating this option.
-                        #
-                        # WARNING: The use of build optimizations may be dangerous.
-                        #   You should know what you are doing and be sure that the
-                        #   optimization settings listed below are what you want.
-                        #   It there are build issues or the system doesn't work as
-                        #   expected, please rebuild without optimizations before
-                        #   asking for support.
+                bool    "Optimization and parallelization"
+                default n
+                help
+                        #   Opens a menu for various optimization settings:
+                        #   Actual optimization flags MUST be defined in ./optimize/*
+                        #   before activating this option.
+                        #
+                        # WARNING: The use of build optimizations may lead to build issues.
+                        #   If the system doesn't work as expected, please rebuild
+                        #   without optimizations before asking for support.
+        menu    "Optimization settings"
+                depends on CONFIG_OPTIMIZE
+
+        config  N_PARALLEL
+                int "Number of parallel `make' jobs"
+                default 1
+                help
+                        #-- The usual recommandation is (number of CPU cores)+1
+                        #   Do not set for meaningful SBU calculations.
 
         choice
                 prompt "Optimization level "
                 default OPT_1
-                depends CONFIG_OPTIMIZE
                 help
                         #-- Optimization values are set in optimize/* files
@@ -1101 +1036 @@
                         bool    "Cross tools (only MAKEFLAGS), temp tools and final system" if BOOK_CLFS
         endchoice
-
+endmenu
         config  OPTIMIZE
                 int
@@ -1112 +1047 @@
 
         #-- Internal Settings
-        menu "--- Internal Settings (WARNING: for jhalfs developers only)"
+        menu "Internal Settings (WARNING: for jhalfs developers only)"
 
                 config  SCRIPT_ROOT
@@ -1175 +1110 @@
         bool "Rebuild the Makefile (see help)"
         default n
-#       depends on !BOOK_BLFS
         help
                 #-- Rebuild the Makefile