Changeset 725ae5a

Timestamp:

08/01/2006 08:05:42 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

9485eba

Parents:

982ae7c

Message:

Touch up work to Config.in

Files:

• Config.in (modified) (7 diffs)
• HLFS/master.sh (modified) (1 diff)

Config.in

@@ -13 +13 @@
                 config  BOOK_CLFS2
                         bool "clfs2"
+#               config  BOOK_CLFS3
+#                       bool "clfs3 (Embedded LFS)"
                 config  BOOK_HLFS
                         bool "hlfs"
@@ -38 +40 @@
                         bool    "Working Copy"
                 config  BRANCH
-                        bool    "Branch"        if !BOOK_HLFS && !BOOK_CLFS2
+                        bool    "Branch"        if !BOOK_HLFS && !BOOK_CLFS2 && !BOOK_BLFS
         endchoice
 
@@ -196 +198 @@
         config  BOOT_CONFIG
                 string  "BOOT kernel config file (mandatory)"
-                default ""
+                default "***EDIT ME***"
                 depends on BUILD_BOOT
                 help
@@ -216 +218 @@
                         === Note about CLFS ===
                         If building the SVN or 1.0.0rc3 version using the boot method and
-                        compiling the keymap into the kernel, you MUST to edit the "loadkeys"
-                        command found in $JHALFSDIR/clfs-commands/boot/066-kernel to set the 
-                        full path in your host to the keymap file.
+                        compiling the keymap into the kernel, you MUST manually edit the 
+                        "loadkeys" command found in $JHALFSDIR/clfs-commands/boot/066-kernel
+                        to set the full path in your host to the keymap file.
 
 comment "----------------------------------------"
@@ -300 +302 @@
                         Clean the build directory before performing any other task. The directory
                         is cleaned only if it was populated by a previous JHALFS run.
+                        NOTE::You must be 'root' for this function to work
 
         config  CONFIG_STRIP
@@ -425 +428 @@
         config  TIMEZONE
                 string "TimeZone"
-                default "America/New_York"
+                default "America/Toronto"
                 help
                         This will be copied to /etc/localtime
@@ -499 +502 @@
                         #    a keymap included in the kernel
 
-
+        config  CONFIG_BLFS_CMDS
+                bool    "Add BLFS packages to current build"
+                default n
+                depends !BOOK_HLFS && XXX
+                help
+                        #--- Select this option if you wish to install any BLFS packages
+                        #    as part of your {c,h}lfs build.
+                        #    Any needed packages will be downloaded to the /sources dir
+        config  BLFS_CMDLINE
+                string  "BLFS packages"
+                default "none"
+                depends CONFIG_BLFS_CMDS 
+                
+                
 # convert CONFIG_XXXX n/y to XXXX 0/1 
 

HLFS/master.sh

@@ -370 +370 @@
         glibc ) [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
           ;;
-            * ) [[ "$TEST"  = "2" ]] && wrt_test_log2 "${this_script}"
+            * ) [[ "$TEST"  = "2" ]] && [[ "$TEST"  = "3" ]] && wrt_test_log2 "${this_script}"
           ;;
       esac