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

Started ICA support.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-04-08 12:21:34 +00:00
parent 902672f395
commit 42346b23f9
5 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
LFS/master.sh
View file

@ -155,7 +155,10 @@ chapter6_Makefiles() {
# dependencies and target creation.
case "${this_script}" in
*chroot) continue ;;
*stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
*stripping*) [[ "${STRIP}" = "0" ]] && continue
[[ "${STRIP}" != "0" ]] && [[ "$RUN_ICA" != "0" ]] && \
ICA_rebuild="$ICA_rebuild ${this_script}"
;;
esac
# First append each name of the script files to a list (this will become
@ -182,6 +185,8 @@ chapter6_Makefiles() {
if [ "$vrs" != "" ] ; then
FILE="$name-$vrs.tar.*"
wrt_unpack2 "$FILE"
# Add it to the ICA_rebuild target
[[ "$RUN_ICA" != "0" ]] && ICA_rebuild="$ICA_rebuild ${this_script}"
fi
# In the mount of kernel filesystems we need to set LFS
@ -390,6 +395,15 @@ restore-lfs-env:
@chown lfs:lfs /home/lfs/.bash* && \\
touch \$@
EOF
) >> $MKFILE
# Add the ICA targets
[[ "$RUN_ICA" != "0" ]] && \
(
cat << EOF
ICA_rebuild: $ICA_rebuild
EOF
) >> $MKFILE

3
common/common-functions
View file

@ -76,6 +76,9 @@ ${BOLD} -W, --working-copy DIR${OFF}
[[ ${PROGNAME} != "blfs" ]] &&
cat <<- -EOF-
${BOLD} --do-ICA${OFF}
do the Iterative Comparison Analysis. That will take several time.
${BOLD} -F, --fstab FILE${OFF}
use FILE as the /etc/fstab file for the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} system. If not specified,
a default /etc/fstab file with dummy values is created.

2
common/config
View file

@ -72,5 +72,5 @@ ICALOGDIR=$JHALFSDIR/logs/ICA
# Don't edit it unless you know what you are doing
#--- Working directories
JHALFSDIR=$BUILDDIR/jhalfs
JHALFSDIR=$BUILDDIR/jhalfs-ica
LOGDIR=$JHALFSDIR/logs

9
common/func_validate_configs.sh
View file

@ -85,10 +85,10 @@ validate_config() { # Are the config values sane (within reason)
inline_doc
# First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG DEPEND TEST"
local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL"
local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD ARCH TARGET TEST STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE TEST STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG"
local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG DEPEND TEST"
local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE RUN_ICA MODEL GRSECURITY_HOST TEST STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL"
local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE RUN_ICA METHOD ARCH TARGET TEST STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE RUN_ICA TEST STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG"
local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
@ -132,6 +132,7 @@ inline_doc
MKFILE) continue;;
HPKG) validation_str="x0x x1x"; validate_str; continue ;;
RUNMAKE) validation_str="x0x x1x"; validate_str; continue ;;
RUN_ICA) validation_str="x0x x1x"; validate_str; continue ;;
TEST) validation_str="x0x x1x x2x x3x"; validate_str; continue ;;
STRIP) validation_str="x0x x1x"; validate_str; continue ;;
VIMLANG) validation_str="x0x x1x"; validate_str; continue ;;

2
master.sh
View file

@ -210,6 +210,8 @@ while test $# -gt 0 ; do
;;
# Common options for LFS, CLFS and HLFS
--do-ICA ) RUN_ICA=1 ;;
--fstab | -F )
test $# = 1 && eval "$exit_missing_arg"
shift