Changeset 4612459


Ignore:
Timestamp:
04/09/2006 10:27:06 AM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
6608a67
Parents:
e65a92f
Message:

Adding farce to config options.

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • common/common-functions

    re65a92f r4612459  
    7777cat <<- -EOF-
    7878
    79 ${BOLD}  --do-ICA${OFF}
    80          do the Iterative Comparison Analysis. That will take several time.
     79${BOLD}  -C, --comparasion TYPE${OFF}
     80         do iterative comparison analysis. That will take several time due that
     81         the final system packages wil be rebuilded the times defined in the
     82         ITERATIONS config option.
     83         Analisys types allowed are:
     84           ICA   = do the ICA analisys designed by Greg Schafer
     85           farce = do the farce analisys designed by Ken Moffat
     86           both  = perfom both ICA and farce analisys
    8187
    8288${BOLD}  -F, --fstab FILE${OFF}

  • common/config

    re65a92f r4612459  
    5959KEYMAP=none
    6060
    61 #=== Variables needed by ICA ===
     61#=== Variables needed by iterative comparison analysis ===
     62#--- The number of final stage builds to create and compare, min. 2, max. 5
     63ITERATIONS=3
     64
    6265#--- Run ICA testing 0/1  0(no)/1(yes)
    6366RUN_ICA=0
    6467
    65 #--- The number of final stage builds to create and compare, min. 2, max. 5
    66 ITERATIONS=3
    67 
    6868#--- ICA report log directory
    6969ICALOGDIR=$JHALFSDIR/logs/ICA
     70
     71#--- Run farce testing 0/1  0(no)/1(yes)
     72RUN_FARCE=0
     73
     74#--- farce report log directory
     75FARCELOGDIR=$JHALFSDIR/logs/farce
    7076
    7177#==== INTERNAL VARIABLES ====

  • common/func_validate_configs.sh

    re65a92f r4612459  
    8181    modifies:   none
    8282    returns:    nothing
    83     on error:   write text to console and dies
     83    on error:   write text to console and dies
    8484    on success: write text to console and returns
    8585inline_doc
    … …  
    8787  # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
    8888  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG         DEPEND                TEST"
    89   local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST RUN_ICA ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
    90   local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST RUN_ICA ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
    91   local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST RUN_ICA ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
     89  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
     90  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
     91  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
    9292
    9393  local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    … …  
    134134        RUNMAKE)    validation_str="x0x x1x";          validate_str; continue ;;
    135135        RUN_ICA)    validation_str="x0x x1x";          validate_str; continue ;;
     136        RUN_FARCE)  validation_str="x0x x1x";          validate_str; continue ;;
    136137        ITERATIONS) validation_str="x2x x3x x4x x5x";  validate_str; continue ;;
    137138        TEST)       validation_str="x0x x1x x2x x3x";  validate_str; continue ;;
    … …  
    187188           if [ ! -d ${SRC_ARCHIVE} ]; then
    188189             echo "   -- is NOT a directory"
    189              write_error_and_die
     190             write_error_and_die
    190191           fi
    191192           if [ ! -w ${SRC_ARCHIVE} ]; then

  • master.sh

    re65a92f r4612459  
    9797
    9898###################################
    99 ###             MAIN            ###
     99###          MAIN               ###
    100100###################################
    101101
    … …  
    215215
    216216    # Common options for LFS, CLFS and HLFS
    217     --do-ICA )              RUN_ICA=1    ;;
     217    --comparasion | -C )
     218      test $# = 1 && eval "$exit_missing_arg"
     219      shift
     220      case $PROGNAME in
     221        ICA)              RUN_ICA=1
     222                        RUN_FARCE=0
     223        ;;
     224        farce)            RUN_ICA=0
     225                        RUN_FARCE=1
     226        ;;
     227        both)             RUN_ICA=1
     228                        RUN_FARCE=1
     229        *)
     230          echo -e "\n$1 is an unknown analisys method."
     231          exit 1
     232          ;;
     233      esac
     234      ;;
    218235
    219236    --fstab | -F )
    … …  
    462479if [[ "$PWD" != "$JHALFSDIR" ]]; then
    463480  cp $COMMON_DIR/makefile-functions $JHALFSDIR/
    464   if [[ "$RUN_ICA" != "0" ]]; then
    465     cp $COMMON_DIR/do_ica_{prep,work} $JHALFSDIR/
     481  if [[ "$RUN_ICA" = "1" ]] || [[ "$RUN_FARCE" = "1" ]]; then
     482    mkdir $JHALFSDIR/extras
     483    cp extras/* $JHALFSDIR/extras
    466484  fi
    467485  if [[ -n "$FILES" ]]; then
Note: See TracChangeset for help on using the changeset viewer.