Changed BOOTMINIMAL (1/0) to METHOD (chroot/boot)
This commit is contained in:
parent
1917cad2d0
commit
afd0232d13
3 changed files with 20 additions and 20 deletions
18
CLFS/config
18
CLFS/config
|
@ -7,7 +7,7 @@
|
|||
#####
|
||||
declare -r FTP=ftp://ftp.linuxfromscratch.org/pub/lfs/conglomeration
|
||||
|
||||
#--- Which target architecture,
|
||||
#--- Which target architecture,
|
||||
# used to select proper book and set TARGETS
|
||||
#--------------------------------
|
||||
TARGET32=""
|
||||
|
@ -16,18 +16,18 @@ TARGET=
|
|||
ARCH=x86 ; TARGET="i486-pc-linux-gnu"
|
||||
# ARCH=x86 ; TARGET="i586-pc-linux-gnu"
|
||||
# ARCH=x86 ; TARGET="i686-pc-linux-gnu"
|
||||
# ARCH=ppc ; TARGET="powerpc-unknown-linux-gnu"
|
||||
# ARCH=ppc ; TARGET="powerpc-unknown-linux-gnu"
|
||||
# ARCH=mips ; TARGET="mipsel-unknown-linux-gnu"
|
||||
# ARCH=mips ; TARGET="mis-unknown-linux-gnu"
|
||||
# ARCH=sparc ; TARGET="sparcv9-unknown-linux-gnu"
|
||||
# ARCH=sparcv8 ; TARGET="sparc-unknown-linux-gnu"
|
||||
# ARCH=sparc ; TARGET="sparcv9-unknown-linux-gnu"
|
||||
# ARCH=sparcv8 ; TARGET="sparc-unknown-linux-gnu"
|
||||
#--------------------------------
|
||||
# >>>> 64-64 BUILD <<<<
|
||||
# ARCH=x86_64-64 ; TARGET="x86_64-unknown-linux-gnu"
|
||||
# ARCH=x86_64-64 ; TARGET="x86_64-unknown-linux-gnu"
|
||||
# ARCH=mips64-64 ; TARGET="mipsel-unknown-linux-gnu"
|
||||
# ARCH=mips64-64 ; TARGET="mis-unknown-linux-gnu"
|
||||
# ARCH=sparc64-64 ; TARGET="sparc64-unknown-linux-gnu"
|
||||
# ARCH=alpha ; TARGET="alpha-unknown-linux-gnu"
|
||||
# ARCH=sparc64-64 ; TARGET="sparc64-unknown-linux-gnu"
|
||||
# ARCH=alpha ; TARGET="alpha-unknown-linux-gnu"
|
||||
#--------------------------------
|
||||
# >>>> MULTILIB 32/64 <<<<
|
||||
# ARCH=x86_64 ; TARGET="x86_64-unknown-linux-gnu" ; TARGET32="i686-pc-linux-gnu"
|
||||
|
@ -35,9 +35,9 @@ TARGET=
|
|||
# ARCH=mips64 ; TARGET="mis-unknown-linux-gnu" ; TARGET32="mis-unknown-linux-gnu"
|
||||
# ARCH=sparc64 ; TARGET="sparc64-unknown-linux-gnu" ; TARGET32="sparcv9-unknown-linux-gnu"
|
||||
|
||||
#--- Create a minimal boot system 0(chroot)/1(bootmin)
|
||||
#--- Create a minimal boot system chroot/boot
|
||||
# NOTE: not all combinations are 'bootable' yet.
|
||||
BOOTMINIMAL=0
|
||||
METHOD=chroot
|
||||
|
||||
#--- Location of fstab file (if empty, a template is created)
|
||||
FSTAB=
|
||||
|
|
|
@ -369,7 +369,7 @@ chroot_Makefiles() { #
|
|||
#-----------------------------#
|
||||
testsuite_tools_Makefiles() { #
|
||||
#-----------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}testsuite tools${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) testsuite tools${R_arrow}"
|
||||
|
||||
for file in testsuite-tools/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -422,7 +422,7 @@ testsuite_tools_Makefiles() { #
|
|||
#--------------------------------#
|
||||
bm_testsuite_tools_Makefiles() { #
|
||||
#--------------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(minimal boot) testsuite tools${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) testsuite tools${R_arrow}"
|
||||
|
||||
for file in testsuite-tools/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -475,7 +475,7 @@ bm_testsuite_tools_Makefiles() { #
|
|||
#-----------------------------#
|
||||
final_system_Makefiles() { #
|
||||
#-----------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}final system${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) final system${R_arrow}"
|
||||
|
||||
for file in final-system/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -576,7 +576,7 @@ final_system_Makefiles() { #
|
|||
#-----------------------------#
|
||||
bm_final_system_Makefiles() { #
|
||||
#-----------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(minimal boot) final system${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) final system${R_arrow}"
|
||||
|
||||
for file in final-system/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -690,7 +690,7 @@ bm_final_system_Makefiles() { #
|
|||
#-----------------------------#
|
||||
bootscripts_Makefiles() { #
|
||||
#-----------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}bootscripts${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) bootscripts${R_arrow}"
|
||||
|
||||
for file in bootscripts/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -768,7 +768,7 @@ EOF
|
|||
#-----------------------------#
|
||||
bm_bootscripts_Makefiles() { #
|
||||
#-----------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(minimal boot) bootscripts${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) bootscripts${R_arrow}"
|
||||
|
||||
for file in bootscripts/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -848,7 +848,7 @@ EOF
|
|||
#-----------------------------#
|
||||
bootable_Makefiles() { #
|
||||
#-----------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}make bootable${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(chroot) make bootable${R_arrow}"
|
||||
|
||||
for file in bootable/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -931,7 +931,7 @@ bootable_Makefiles() { #
|
|||
#-----------------------------#
|
||||
bm_bootable_Makefiles() { #
|
||||
#-----------------------------#
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(minimal boot) make bootable${R_arrow}"
|
||||
echo "${tab_}${GREEN}Processing... ${L_arrow}(boot) make bootable${R_arrow}"
|
||||
|
||||
for file in bootable/* ; do
|
||||
# Keep the script file name
|
||||
|
@ -1035,7 +1035,7 @@ build_Makefile() { # Construct a Makefile from the book scripts
|
|||
host_prep_Makefiles
|
||||
cross_tools_Makefiles
|
||||
temptools_Makefiles
|
||||
if [[ $BOOTMINIMAL = "0" ]]; then
|
||||
if [[ $METHOD = "chroot" ]]; then
|
||||
chroot_Makefiles
|
||||
if [[ $TOOLCHAINTEST = "1" ]]; then
|
||||
testsuite_tools_Makefiles
|
||||
|
|
|
@ -20,7 +20,7 @@ inline_doc
|
|||
local -r lfs_PARAM_LIST="VIMLANG"
|
||||
local -r blfs_PARAM_LIST="TEST DEPEND"
|
||||
local -r hlfs_PARAM_LIST="MODEL GRSECURITY_HOST"
|
||||
local -r clfs_PARAM_LIST="ARCH BOOTMINIMAL VIMLANG"
|
||||
local -r clfs_PARAM_LIST="ARCH METHOD VIMLANG"
|
||||
local -r global_PARAM_LIST="BUILDDIR HPKG RUNMAKE TEST STRIP PAGE TIMEZONE"
|
||||
|
||||
local -r ERROR_MSG='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid, ${nl_}check the config file ${BOLD}${GREEN}\<$PROGNAME.conf\>${OFF}'
|
||||
|
@ -61,7 +61,7 @@ inline_doc
|
|||
PAGE) validation_str="xletterx xA4x" ;;
|
||||
ARCH) validation_str="xx86x xx86_64x xx86_64-64x xsparcx xsparcv8x xsparc64x xsparc64-64x xmipsx xmips64x xmips64-64x xppcx xalphax" ;;
|
||||
GRSECURITY_HOST) validation_str="x0x x1x" ;;
|
||||
BOOTMINIMAL) validation_str="x0x x1x";;
|
||||
METHOD) validation_str="xchrootx xbootx";;
|
||||
*)
|
||||
echo "WHAT PARAMETER IS THIS.. <<${config_param}>>"
|
||||
exit
|
||||
|
|
Reference in a new issue