Touch up work to Config.in

This commit is contained in:
George Boudreau 2006-08-01 20:05:42 +00:00
parent 982ae7c8fc
commit 725ae5a469
2 changed files with 24 additions and 8 deletions

View file

@ -12,6 +12,8 @@ mainmenu "JHALFS Build Script Configuration"
bool "clfs" bool "clfs"
config BOOK_CLFS2 config BOOK_CLFS2
bool "clfs2" bool "clfs2"
# config BOOK_CLFS3
# bool "clfs3 (Embedded LFS)"
config BOOK_HLFS config BOOK_HLFS
bool "hlfs" bool "hlfs"
config BOOK_BLFS config BOOK_BLFS
@ -37,7 +39,7 @@ mainmenu "JHALFS Build Script Configuration"
config WORKING_COPY config WORKING_COPY
bool "Working Copy" bool "Working Copy"
config BRANCH config BRANCH
bool "Branch" if !BOOK_HLFS && !BOOK_CLFS2 bool "Branch" if !BOOK_HLFS && !BOOK_CLFS2 && !BOOK_BLFS
endchoice endchoice
config BRANCH_ID config BRANCH_ID
@ -195,7 +197,7 @@ depends on BOOK_CLFS || BOOK_CLFS2
config BOOT_CONFIG config BOOT_CONFIG
string "BOOT kernel config file (mandatory)" string "BOOT kernel config file (mandatory)"
default "" default "***EDIT ME***"
depends on BUILD_BOOT depends on BUILD_BOOT
help help
#--- If METHOD=boot, location of boot-kernel config file #--- If METHOD=boot, location of boot-kernel config file
@ -215,9 +217,9 @@ depends on BOOK_CLFS || BOOK_CLFS2
=== Note about CLFS === === Note about CLFS ===
If building the SVN or 1.0.0rc3 version using the boot method and 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" compiling the keymap into the kernel, you MUST manually edit the
command found in $JHALFSDIR/clfs-commands/boot/066-kernel to set the "loadkeys" command found in $JHALFSDIR/clfs-commands/boot/066-kernel
full path in your host to the keymap file. to set the full path in your host to the keymap file.
comment "----------------------------------------" comment "----------------------------------------"
depends on BOOK_CLFS || BOOK_CLFS2 depends on BOOK_CLFS || BOOK_CLFS2
@ -299,6 +301,7 @@ depends on BOOK_HLFS
help help
Clean the build directory before performing any other task. The directory Clean the build directory before performing any other task. The directory
is cleaned only if it was populated by a previous JHALFS run. 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 config CONFIG_STRIP
bool "Strip Installed Binaries/Libraries" bool "Strip Installed Binaries/Libraries"
@ -424,7 +427,7 @@ depends on BOOK_HLFS
config TIMEZONE config TIMEZONE
string "TimeZone" string "TimeZone"
default "America/New_York" default "America/Toronto"
help help
This will be copied to /etc/localtime This will be copied to /etc/localtime
@ -498,7 +501,20 @@ depends on BOOK_HLFS
# (e.g., i386/qwerty/us.map.gz) or "none" if you do not want # (e.g., i386/qwerty/us.map.gz) or "none" if you do not want
# a keymap included in the kernel # 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 # convert CONFIG_XXXX n/y to XXXX 0/1
config COMPARE config COMPARE

View file

@ -369,7 +369,7 @@ chapter6_Makefiles() { # sysroot or chroot build phase
case $name in case $name in
glibc ) [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" 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 esac
# If using optimizations, write the instructions # If using optimizations, write the instructions