zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Housekeeping only

Browse source
This commit is contained in:
George Boudreau 2006-03-10 14:27:12 +00:00
parent 1ce084edc4
commit 3f858cab76
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
LFS/master.sh
View file

@ -91,6 +91,10 @@ chapter5_Makefiles() {
# Set the dependency for the first target.
if [ -z $PREV ] ; then PREV=022-settingenvironment ; fi
#--------------------------------------------------------------------#
# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< #
#--------------------------------------------------------------------#
#
# Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function.
wrt_target "${this_script}" "$PREV"
@ -107,8 +111,7 @@ chapter5_Makefiles() {
FILE="$name-$vrs.tar"
fi
# Insert instructions for unpacking the package and to set
# the PKGDIR variable.
# Insert instructions for unpacking the package and to set the PKGDIR variable.
wrt_unpack "$FILE"
echo -e '\ttrue' >> $MKFILE.tmp
fi
@ -126,6 +129,10 @@ chapter5_Makefiles() {
# Include a touch of the target name so make can check
# if it's already been made.
echo -e '\t@touch $@' >> $MKFILE.tmp
#
#--------------------------------------------------------------------#
# >>>>>>>> END OF Makefile ENTRY <<<<<<<< #
#--------------------------------------------------------------------#
# Keep the script file name for Makefile dependencies.
PREV=${this_script}
@ -158,6 +165,10 @@ chapter6_Makefiles() {
# Grab the name of the target
name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
#--------------------------------------------------------------------#
# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< #
#--------------------------------------------------------------------#
#
# Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function.
wrt_target "${this_script}" "$PREV"
@ -173,11 +184,10 @@ chapter6_Makefiles() {
wrt_unpack2 "$FILE"
fi
if [[ `_IS_ ${this_script} glibc` ]] ; then # For Glibc we need to set TIMEZONE envar.
wrt_export_timezone
elif [[ `_IS_ ${this_script} groff` ]] ; then # For Groff we need to set PAGE envar.
wrt_export_pagesize
fi
case "${this_script}" in
*glibc* ) wrt_export_timezone ;; # For Glibc we need to set TIMEZONE envar.
*groff* ) wrt_export_pagesize ;; # For Groff we need to set PAGE envar.
esac
# In the mount of kernel filesystems we need to set LFS
# and not to use chroot.
@ -195,6 +205,10 @@ chapter6_Makefiles() {
# Include a touch of the target name so make can check
# if it's already been made.
echo -e '\t@touch $@' >> $MKFILE.tmp
#
#--------------------------------------------------------------------#
# >>>>>>>> END OF Makefile ENTRY <<<<<<<< #
#--------------------------------------------------------------------#
# Keep the script file name for Makefile dependencies.
PREV=${this_script}
@ -226,6 +240,10 @@ chapter789_Makefiles() {
# the names of the targets in the Makefile
chapter789="$chapter789 ${this_script}"
#--------------------------------------------------------------------#
# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< #
#--------------------------------------------------------------------#
#
# Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function.
wrt_target "${this_script}" "$PREV"
@ -267,6 +285,10 @@ EOF
# Include a touch of the target name so make can check
# if it's already been made.
echo -e '\t@touch $@' >> $MKFILE.tmp
#
#--------------------------------------------------------------------#
# >>>>>>>> END OF Makefile ENTRY <<<<<<<< #
#--------------------------------------------------------------------#
# Keep the script file name for Makefile dependencies.
PREV=${this_script}

6
common/func_validate_configs.sh
View file

@ -17,10 +17,10 @@ validate_config() { # Are the config values sane (within reason)
on success: write text to console and returns
inline_doc
local -r lfs_PARAM_LIST="BUILDDIR HPKG TEST STRIP VIMLANG PAGE RUNMAKE"
local -r lfs_PARAM_LIST=""
local -r blfs_PARAM_LIST="BUILDDIR TEST DEPEND"
local -r hlfs_PARAM_LIST="BUILDDIR HPKG MODEL TEST STRIP VIMLANG PAGE GRSECURITY_HOST RUNMAKE TIMEZONE"
local -r clfs_PARAM_LIST="ARCH BOOTMINIMAL RUNMAKE MKFILE"
local -r hlfs_PARAM_LIST="MODEL GRSECURITY_HOST"
local -r clfs_PARAM_LIST="ARCH BOOTMINIMAL"
local -r global_PARAM_LIST="BUILDDIR HPKG RUNMAKE TEST STRIP PAGE TIMEZONE VIMLANG"
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}'