Ignore:
Timestamp:
09/19/2007 04:50:48 PM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
3778352
Parents:
0510381
Message:

Updated experimental branch to current trunk code.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • common/libs/func_validate_configs.sh

    r0510381 r9c9775f  
    1313    input vars: none
    1414    externals:  color constants
    15                 PROGNAME (lfs,clfs,hlfs)
     15                PROGNAME (lfs,hlfs,clfs,clfs2,clfs3,blfs)
    1616    modifies:   none
    1717    returns:    nothing
    … …  
    2020inline_doc
    2121
    22   # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
    23   local -r  hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL  GRSECURITY_HOST      TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL         PAGE TIMEZONE LANG LC_ALL LUSER LGROUP BLFS_TOOL"
    24   local -r  clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TARGET32 TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP BLFS_TOOL"
    25   local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE        ARCH TARGET                         OPTIMIZE REPORT                                      STRIP FSTAB             CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP BLFS_TOOL"
    26   local -r   lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                             TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP BLFS_TOOL CUSTOM_TOOLS"
     22  # Common settings by Config.in sections and books family
     23  local -r     BOOK_common="BOOK CUSTOM_TOOLS"
     24  local -r      BOOK_clfsX="ARCH TARGET"
     25  local -r  GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \
     26                            SERVER GETKERNEL RUNMAKE"
     27  local -r    BUILD_chroot="TEST BOMB_TEST STRIP"
     28  local -r    BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG"
     29  local -r ADVANCED_chroot="COMPARE RUN_ICA RUN_FARCE ITERATIONS OPTIMIZE"
     30  local -r ADVANCED_common="REPORT REBUILD_MAKEFILE"
     31
     32  # BOOK Settings by book
     33  local -r   LFS_book="$BOOK_common BLFS_TOOL"
     34  #local -r HLFS_added="SET_SSP SET_ASLR SET_PAX SET_HARDENED_TMP SET_WARNINGS \
     35  #                     SET_MISC SET_BLOWFISH"
     36  local -r HLFS_added=""
     37  local -r  HLFS_book="$BOOK_common BLFS_TOOL MODEL KERNEL GRSECURITY_HOST $HLFS_added"
     38  local -r  CLFS_book="$BOOK_common BLFS_TOOL METHOD $BOOK_clfsX TARGET32 BOOT_CONFIG"
     39  local -r CLFS2_book="$BOOK_common BLFS_TOOL        $BOOK_clfsX"
     40  local -r CLFS3_book="$BOOK_common                  $BOOK_clfsX PLATFORM MIPS_LEVEL"
     41
     42  # Build Settings by book
     43  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common"
     44  local -r  HLFS_build="$BUILD_chroot         $BUILD_common"
     45  local -r  CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
     46  local -r CLFS2_build="STRIP         VIMLANG $BUILD_common"
     47  local -r CLFS3_build="                      $BUILD_common"
     48
     49  # Full list of books settings
     50  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build   $ADVANCED_chroot $ADVANCED_common"
     51  local -r  hlfs_PARAM_LIST="$HLFS_book  $GENERAL_common $HLFS_build  $ADVANCED_chroot $ADVANCED_common"
     52  local -r  clfs_PARAM_LIST="$CLFS_book  $GENERAL_common $CLFS_build  $ADVANCED_chroot $ADVANCED_common"
     53  local -r clfs2_PARAM_LIST="$CLFS2_book $GENERAL_common $CLFS2_build                  $ADVANCED_common"
     54  local -r clfs3_PARAM_LIST="$CLFS3_book $GENERAL_common $CLFS3_build                  $ADVANCED_common"
    2755  local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
    2856
    29   local -r  blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP DEP_DBXML DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET DEP_SVN DEP_GPM"
    30 
     57  # Additional variables (add DEP_DBXSL when required again)
     58  local -r blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR \
     59                                 DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP \
     60                                 DEP_DBXML DEP_LYNX DEP_SUDO DEP_WGET \
     61                                 DEP_SVN DEP_GPM"
     62  local -r custom_tool_PARAM_LIST="TRACKING_DIR"
     63
     64  # Internal variables
    3165  local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    3266  local -r ERROR_MSG_pt2='rerun make and fix your configuration settings${OFF}'
    3367  local -r PARAM_VALS='${config_param}${dotSTR:${#config_param}} ${L_arrow}${BOLD}${!config_param}${OFF}${R_arrow}'
    3468
    35   local    PARAM_LIST=
     69  local PARAM_LIST=
    3670  local config_param
    3771  local validation_str
    … …  
    98132  for config_param in ${!PARAM_GROUP}; do
    99133    case $config_param in
    100       # Allways display this, if found in ${PROGNAME}_PARAM_LIST
    101       GETPKG          | \
    102       RUNMAKE         | \
    103       TEST            | \
    104       OPTIMIZE        | \
    105       STRIP           | \
    106       VIMLANG         | \
    107       MODEL           | \
    108       METHOD          | \
    109       ARCH            | \
    110       TARGET          | \
    111       GRSECURITY_HOST | \
    112       BLFS_TOOL       | \
    113       CUSTOM_TOOLS    | \
    114       TIMEZONE        | \
    115       PAGE)   echo -e "`eval echo $PARAM_VALS`" ;;
    116 
    117134      # Envvars that depend on other settings to be displayed
    118135      GETKERNEL ) if [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] ; then
    … …  
    125142      BOMB_TEST)  [[ ! "$TEST" = "0" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
    126143      TARGET32)   [[ -n "${TARGET32}" ]] &&  echo -e "`eval echo $PARAM_VALS`" ;;
     144      MIPS_LEVEL) [[ "${ARCH}" = "mips" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
     145      SERVER)     [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
    127146
    128147      # Envars that requires some validation
    … …  
    133152                  [[ "${!config_param}" = "**EDIT ME**" ]] && write_error_and_die
    134153                  ;;
    135       REPORT)     echo -e "`eval echo $PARAM_VALS`"
    136                   if [[ "${!config_param}" = "y" ]]; then
    137                     if [[ `type -p bc` ]]; then
    138                       continue
    139                     else
    140                       echo -e "  ${BOLD}The bc binary was not found${OFF}"
    141                       echo -e "  The SBU and disk usage report creation will be skiped"
    142                       REPORT=n
    143                       continue
    144                     fi
    145                   fi ;;
    146 
    147154        # BOOK validation. Very ugly, need be fixed
    148155      BOOK)        if [[ "${WORKING_COPY}" = "y" ]] ; then
    … …  
    150157                   else
    151158                     echo -e "`eval echo $PARAM_VALS`"
    152                    fi ;;
    153 
     159                   fi
     160                  ;;
    154161        # Validate directories, testable states:
    155162        #  fatal   -z -d -w,
    … …  
    158165        # The build directory/partition MUST exist and be writable by the user
    159166      BUILDDIR)   validate_dir -z -d -w
    160                   [[ "xx x/x" =~ "x${!config_param}x" ]] && write_error_and_die ;;
     167                  [[ "xx x/x" =~ x${!config_param}x ]] && write_error_and_die ;;
     168      LHOME)      validate_dir -z -d ;;
    161169
    162170        # Validate files, testable states:
    … …  
    167175      BOOT_CONFIG) [[ "${METHOD}" = "boot" ]] && validate_file -z -e -s ;;
    168176
    169         # Treatment of 'special' parameters
    170       LANG | \
    171       LC_ALL)  # See it the locale values exist on this machine
     177        # Treatment of LANG parameter
     178      LANG )  # See it the locale value has been set
    172179               echo -n "`eval echo $PARAM_VALS`"
    173180               [[ -z "${!config_param}" ]] &&
    … …  
    181188      TRACKING_DIR ) validate_dir -z -d -w ;;
    182189
     190      # Display non-validated envars found in ${PROGNAME}_PARAM_LIST
     191      * ) echo -e "`eval echo $PARAM_VALS`" ;;
     192
    183193    esac
    184194  done
    … …  
    191201  fi
    192202
     203  if [[ "${CUSTOM_TOOLS}" = "y" ]] && [[ "${BLFS_TOOL}" = "n" ]]  ; then
     204    for config_param in ${custom_tool_PARAM_LIST}; do
     205      echo -e "`eval echo $PARAM_VALS`"
     206    done
     207  fi
     208
    193209  set -e
    194210  echo "${nl_}***${BOLD}${GREEN} ${PARAM_GROUP%%_*T} config parameters look good${OFF} ***${nl_}"
Note: See TracChangeset for help on using the changeset viewer.