Changeset 4965fa8 for common


Ignore:
Timestamp:
08/29/2006 06:18:06 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
fff1061
Parents:
4da2512
Message:

Merged r3073:3085 from experimental:
blfs-tool support integration.

Location:
common
Files:
8 added
2 edited

Legend:

Unmodified
Added
Removed

  • common/common-functions

    r4da2512 r4965fa8  
    578578  esac
    579579
     580  [[ "${BLFS_TOOL}" = "y" ]] && copy_blfs_deps_scripts
     581
    580582  echo " ...OK"
    581583
    … …  
    611613      ;;
    612614  esac
     615
     616  if [[ "${BLFS_TOOL}" = "y" ]] ; then
     617(
     618cat << EOF
     619$LIBXML_PKG
     620$LIBXSLT_PKG
     621$DBXSL_PKG
     622$LINKS_PKG
     623$SUDO_PKG
     624$WGET_PKG
     625$SVN_PKG
     626$GPM_PKG
     627EOF
     628) >> pkg_tarball_list
     629  fi
     630
    613631  echo " ...OK"
    614632
    … …  
    781799
    782800  cd $BUILDDIR/sources
    783 }
     801
     802  [[ "${BLFS_TOOL}" = "y" ]] && add_blfs_deps_urls
     803}
     804
     805#----------------------------# Hardcoded URLs and MD5.
     806add_blfs_deps_urls() {       # No easy way to extract it.
     807#----------------------------# Some FTP mirrors may not work
     808
     809  local BLFS_SERVER="${SERVER}/pub/blfs/conglomeration/"
     810
     811  if [[ "${DEP_LIBXML}" = "y" ]] ; then
     812    echo "${LIBXML_URL} ${BLFS_SERVER}libxml2/${LIBXML_PKG} ${LIBXML_MD5}" >> urls.lst
     813  fi
     814
     815  if [[ "${DEP_LIBXSLT}" = "y" ]] ; then
     816    echo "${LIBXSLT_URL} ${BLFS_SERVER}libxslt/${LIBXSLT_PKG} ${LIBXSLT_MD5}" >> urls.lst
     817  fi
     818
     819  if [[ "${DEP_DBXSL}" = "y" ]] ; then
     820    echo "${DBXSL_URL} ${BLFS_SERVER}docbook-xsl/${DBXSL_PKG} ${DBXSL_MD5}" >> urls.lst
     821  fi
     822
     823  if [[ "${DEP_LINKS}" = "y" ]] ; then
     824    echo "${LINKS_URL} ${BLFS_SERVER}links/${LINKS_PKG} ${LINKS_MD5}" >> urls.lst
     825  fi
     826
     827  if [[ "${DEP_SUDO}" = "y" ]] ; then
     828    echo "${SUDO_URL} ${BLFS_SERVER}sudo/${SUDO_PKG} ${SUDO_MD5}" >> urls.lst
     829    echo "${SUDO_PATCH_URL} ${BLFS_SERVER}sudo/${SUDO_PATCH} ${SUDO_PATCH_MD5}" >> urls.lst
     830  fi
     831
     832  if [[ "${DEP_WGET}" = "y" ]] ; then
     833    echo "${WGET_URL} ${BLFS_SERVER}wget/${WGET_PKG} ${WGET_MD5}" >> urls.lst
     834  fi
     835
     836  if [[ "${DEP_SVN}" = "y" ]] ; then
     837    echo "${SVN_URL} ${BLFS_SERVER}subversion/${SVN_PKG} ${SVN_MD5}" >> urls.lst
     838  fi
     839
     840  if [[ "${DEP_GPM}" = "y" ]] ; then
     841    echo "${GPM_URL} ${BLFS_SERVER}gpm/${GPM_PKG} ${GPM_MD5}" >> urls.lst
     842    echo "${GPM_PATCH_1_URL} ${BLFS_SERVER}gpm/${GPM_PATCH_1} ${GPM_PATCH_1_MD5}" >> urls.lst
     843    echo "${GPM_PATCH_2_URL} ${BLFS_SERVER}gpm/${GPM_PATCH_2} ${GPM_PATCH_2_MD5}" >> urls.lst
     844  fi
     845
     846}
     847
     848#----------------------------# Maybe there is a better way to do this, but this
     849copy_blfs_deps_scripts() {   # method avoid to place the test on all
     850#----------------------------# $PROGNAME/master.sh scripts.
     851
     852  mkdir -p ${PROGNAME}-commands/blfs-tool-deps
     853
     854  if [[ "${DEP_LIBXML}" = "y" ]] ; then
     855    mv blfs-tool-deps/901-libxml2 ${PROGNAME}-commands/blfs-tool-deps
     856  fi
     857
     858  if [[ "${DEP_LIBXSLT}" = "y" ]] ; then
     859    mv blfs-tool-deps/902-libxslt ${PROGNAME}-commands/blfs-tool-deps
     860  fi
     861
     862  if [[ "${DEP_DBXSL}" = "y" ]] ; then
     863    mv blfs-tool-deps/903-docbook-xsl ${PROGNAME}-commands/blfs-tool-deps
     864  fi
     865
     866  if [[ "${DEP_LINKS}" = "y" ]] ; then
     867    mv blfs-tool-deps/905-links ${PROGNAME}-commands/blfs-tool-deps
     868  fi
     869
     870  if [[ "${DEP_SUDO}" = "y" ]] ; then
     871    mv blfs-tool-deps/906-sudo ${PROGNAME}-commands/blfs-tool-deps
     872  fi
     873
     874  if [[ "${DEP_WGET}" = "y" ]] ; then
     875    mv blfs-tool-deps/907-wget ${PROGNAME}-commands/blfs-tool-deps
     876  fi
     877
     878  if [[ "${DEP_SVN}" = "y" ]] ; then
     879    mv blfs-tool-deps/908-subversion ${PROGNAME}-commands/blfs-tool-deps
     880  fi
     881
     882  if [[ "${DEP_GPM}" = "y" ]] ; then
     883    mv blfs-tool-deps/904-gpm ${PROGNAME}-commands/blfs-tool-deps
     884  fi
     885
     886  rm -rf blfs-tool-deps
     887
     888}

  • common/func_validate_configs.sh

    r4da2512 r4965fa8  
    2121
    2222  # 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 KEYMAP         PAGE TIMEZONE LANG LC_ALL LUSER LGROUP"
    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 KEYMAP VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP"
    25   local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE        ARCH TARGET                         OPTIMIZE REPORT                                      STRIP FSTAB             CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP"
    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"
     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 KEYMAP         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 KEYMAP 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 KEYMAP 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"
    2727  local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
    2828
     29  local -r  blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR DEP_LIBXML DEP_LIBXSLT DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET DEP_SVN DEP_GPM"
     30
    2931  local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    30   local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
     32  local -r ERROR_MSG_pt2='rerun make and fix your configuration settings${OFF}'
    3133  local -r PARAM_VALS='${config_param}${dotSTR:${#config_param}} ${L_arrow}${BOLD}${!config_param}${OFF}${R_arrow}'
    3234
    … …  
    108110      TARGET          | \
    109111      GRSECURITY_HOST | \
     112      BLFS_TOOL       | \
    110113      TIMEZONE        | \
    111114      PAGE)   echo -e "`eval echo $PARAM_VALS`" ;;
    … …  
    142145
    143146        # BOOK validation. Very ugly, need be fixed
    144       BOOK)        if [[ "${WC}" = "1" ]] ; then
     147      BOOK)        if [[ "${WORKING_COPY}" = "y" ]] ; then
    145148                     validate_dir -z -d
    146149                   else
    … …  
    186189    esac
    187190  done
     191
     192  if [[ "${BLFS_TOOL}" = "y" ]] ; then
     193    echo "${nl_}    ${BLUE}blfs-tool settings${OFF}"
     194    for config_param in ${blfs_tool_PARAM_LIST}; do
     195      echo -e "`eval echo $PARAM_VALS`"
     196    done
     197  fi
     198
    188199  set -e
    189200  echo "${nl_}***${BOLD}${GREEN} ${PARAM_GROUP%%_*T} config parameters look good${OFF} ***${nl_}"
Note: See TracChangeset for help on using the changeset viewer.