Changeset 34933b4


Ignore:
Timestamp:
05/27/2006 06:45:16 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
e6ef6fcc
Parents:
7e43a37
Message:

Merged r2726 from trunk.

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CLFS/config

    r7e43a37 r34933b4  
    5050BOOT_CONFIG=
    5151
     52# Get the kernel package and patches even if no configutation file
     53# has been supplied? 0(no)/1(yes)
     54GETKERNEL=0
     55
    5256#--- Book's sources directory
    5357# If you have previously checked out the book from the repository

  • HLFS/config

    r7e43a37 r34933b4  
    2020CONFIG=
    2121
     22# Get the kernel package and patches even if no configutation file
     23# has been supplied? 0(no)/1(yes)
     24GETKERNEL=0
     25
    2226#--- Book's sources directory
    2327# If you have previously checked out the book from the repository

  • LFS/config

    r7e43a37 r34933b4  
    1313# If no config file is  specified the kernel is NOT compiled
    1414CONFIG=
     15
     16# Get the kernel package and patches even if no configutation file
     17# has been supplied? 0(no)/1(yes)
     18GETKERNEL=0
    1519
    1620#--- Book's sources directory

  • common/common-functions

    r7e43a37 r34933b4  
    625625          ;;
    626626        *linux/linux-* )
    627             [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && continue
     627            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
     628            [[ "$GETKERNEL" = "0" ]] && continue
    628629          ;;
    629630    esac

  • common/func_validate_configs.sh

    r7e43a37 r34933b4  
    8585
    8686  # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
    87   local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
    88   local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
    89   local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
     87  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
     88  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
     89  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
    9090
    9191  local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    … …  
    173173      # Validate general parameters..
    174174      GETPKG)     validate_against_str "x0x x1x" ;;
     175      GETKERNEL ) if [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] ; then
     176                    [[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x"
     177                  fi ;;
    175178      RUNMAKE)    validate_against_str "x0x x1x" ;;
    176179      REPORT)     validate_against_str "x0x x1x"
Note: See TracChangeset for help on using the changeset viewer.