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

Moved the ICA targets creation to func_ICA.sh

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-04-08 14:02:59 +00:00
parent 158b30fb4e
commit a5fa1a9070
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LFS/master.sh
View file

@ -399,13 +399,7 @@ EOF
) >> $MKFILE ) >> $MKFILE
# Add the ICA targets # Add the ICA targets
[[ "$RUN_ICA" != "0" ]] && \ [[ "$RUN_ICA" != "0" ]] && wrt_ica_targets "$ICA_rebuild"
(
cat << EOF
ICA_rebuild: $ICA_rebuild
EOF
) >> $MKFILE
# Bring over the items from the Makefile.tmp # Bring over the items from the Makefile.tmp
cat $MKFILE.tmp >> $MKFILE cat $MKFILE.tmp >> $MKFILE

32
common/func_ICA.sh
View file

@ -1,9 +1,21 @@
# $Id$ # $Id$
#----------------------------------#
wrt_ica_targets() { #
#----------------------------------#
local ICA_rebuild=$1
(
cat << EOF
ICA_rebuild: $ICA_rebuild
EOF
) >> $MKFILE
}
# Acknowledgment: # Acknowledgment:
# The following code is a modified version of an original work written by # The following code is a modified version of an original work written by
# Greg Schafer for the "DIY Linux" project and is included here with his # Greg Schafer for the "DIY Linux" project and is included here with his
# permission. # permission.
# ref: http://www.diy-linux.org # ref: http://www.diy-linux.org
# #
# #
@ -32,15 +44,15 @@ do_ica_prep() { #
#----------------------------------# #----------------------------------#
: <<inline_doc : <<inline_doc
desc: desc:
usage:
input vars: usage:
input vars:
externals: -- externals: --
modifies: -- modifies: --
returns: -- returns: --
on error: on error:
on success: on success:
inline_doc inline_doc
local CMP_DIR F L BN local CMP_DIR F L BN
@ -138,7 +150,7 @@ do_ica_work() { # Do the ICA grunt work.
#----------------------------------# #----------------------------------#
: <<inline_doc : <<inline_doc
desc: desc:
usage: do_ica_work 1 2 usage: do_ica_work 1 2
do_ica_work 2 3 do_ica_work 2 3
@ -147,8 +159,8 @@ do_ica_work() { # Do the ICA grunt work.
externals: -- externals: --
modifies: -- modifies: --
returns: -- returns: --
on error: on error:
on success: on success:
inline_doc inline_doc
local ICA_DIR="${SCRATCH_DIR}/cmp" local ICA_DIR="${SCRATCH_DIR}/cmp"

6
master.sh
View file

@ -51,12 +51,16 @@ source $COMMON_DIR/common-functions
[[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit [[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
# #
[[ $VERBOSITY > 0 ]] && echo -n "Loading masterscript conf..." [[ $VERBOSITY > 0 ]] && echo -n "Loading masterscript conf..."
source $COMMON_DIR/config source $COMMON_DIR/config
[[ $? > 0 ]] && echo "$COMMON_DIR/conf did not load.." && exit [[ $? > 0 ]] && echo "$COMMON_DIR/conf did not load.." && exit
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
# #
[[ $VERBOSITY > 0 ]] && echo -n "Loading ICA module..."
source $COMMON_DIR/func_ICA.sh
[[ $? > 0 ]] && echo "$COMMON_DIR/func_ICA.sh did not load.." && exit
[[ $VERBOSITY > 0 ]] && echo "OK"
#
[[ $VERBOSITY > 0 ]] && echo -n "Loading config module <$MODULE_CONFIG>..." [[ $VERBOSITY > 0 ]] && echo -n "Loading config module <$MODULE_CONFIG>..."
source $MODULE_CONFIG source $MODULE_CONFIG
[[ $? > 0 ]] && echo "$MODULE_CONFIG did not load.." && exit 1 [[ $? > 0 ]] && echo "$MODULE_CONFIG did not load.." && exit 1