Changeset 15cad16


Ignore:
Timestamp:
04/30/2006 07:42:10 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
799b0d1
Parents:
c03b616
Message:

New download code.

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • CLFS/config

    rc03b616 r15cad16  
    66#
    77#####
    8 declare -r FTP=ftp://ftp.linuxfromscratch.org/pub/lfs/conglomeration
    98
    109#--- Which target architecture you want to build for,
    … …  
    7069MKFILE=$JHALFSDIR/Makefile
    7170
    72 #--- FTP/HTTP mirror used as fallback (full path)
    73 SERVER=ftp://anduin.linuxfromscratch.org/LFS/conglomeration

  • HLFS/config

    rc03b616 r15cad16  
    66#
    77#####
    8 declare -r FTP=ftp://ftp.linuxfromscratch.org/pub/lfs/conglomeration
    98
    109#--- Which library model to use uclibc/glibc
    … …  
    3938#--- Name of the makefile
    4039MKFILE=$JHALFSDIR/Makefile
    41 
    42 #--- FTP/HTTP mirror used as fallback (full path)
    43 SERVER=ftp://anduin.linuxfromscratch.org/HLFS/conglomeration

  • HLFS/master.sh

    rc03b616 r15cad16  
    77###          FUNCTIONS          ###
    88###################################
    9 
    10 
    11 #----------------------------#
    12 get_sources() {              #
    13 #----------------------------#
    14   local IFS
    15 
    16   # Test if the packages must be downloaded
    17   if [ ! "$HPKG" = "1" ] ; then
    18     return
    19   fi
    20 
    21   # Modify the 'internal field separator' to break on 'LF' only
    22   IFS=$'\x0A'
    23 
    24   if [ ! -d $BUILDDIR/sources ] ; then mkdir $BUILDDIR/sources ; fi
    25   cd $BUILDDIR/sources
    26 
    27   > MISSING_FILES.DMP  # Files not in md5sum end up here
    28 
    29   if [ -f MD5SUMS ] ; then rm MD5SUMS ; fi
    30   if [ -f MD5SUMS-$VERSION ] ; then rm MD5SUMS-$VERSION ; fi
    31 
    32   # Retrieve the master md5sum file
    33   download "" MD5SUMS
    34 
    35   # Iterate through each package and grab it, along with any patches it needs.
    36   for i in `cat $JHALFSDIR/packages` ; do
    37     PKG=`echo $i | sed -e 's/-version.*//' \
    38                        -e 's/uclibc/uClibc/' `
    39 
    40     #
    41     # How to deal with orphan packages..??
    42     #
    43     VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
    44     case "$PKG" in
    45       "gcc" )
    46         download $PKG "gcc-core-$VRS.tar.bz2"
    47         download $PKG "gcc-g++-$VRS.tar.bz2"
    48         if [ ! "$TEST" = "0" ] ; then
    49           download $PKG "gcc-testsuite-$VRS.tar.bz2" ;
    50         fi
    51         ;;
    52 
    53       "glibc")
    54         if [ "$MODEL" = "glibc" ] ; then
    55           download $PKG "$PKG-$VRS.tar.bz2"
    56           download $PKG "$PKG-libidn-$VRS.tar.bz2"
    57         fi
    58         ;;
    59 
    60       "tcl" )
    61         FILE="$PKG$VRS-src.tar.bz2" ; download $PKG $FILE ;;
    62 
    63       "uclibc" )
    64         if [ "$MODEL" = "uclibc" ] ; then
    65           download $PKG "$PKG-$VRS.tar.bz2"
    66         fi
    67         ;;
    68 
    69       "uClibc-locale" )
    70         if [ "$MODEL" = "uclibc" ] ; then
    71           FILE="$PKG-$VRS.tgz" ; PKG="uClibc"
    72           download $PKG $FILE
    73           # There can be no patches for this file
    74           continue
    75         fi
    76         ;;
    77 
    78       "uClibc-patch" )      continue ;;
    79 
    80       * )
    81         FILE="$PKG-$VRS.tar.bz2" ;  download $PKG $FILE ;;
    82     esac
    83 
    84     for patch in `grep "$PKG-&$PKG" $JHALFSDIR/patches` ; do
    85       PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
    86       download $PKG $PATCH
    87     done
    88 
    89   done
    90 
    91   # .... U G L Y .... what to do with the grsecurity patch to the kernel..
    92   download grsecurity `grep grsecurity $JHALFSDIR/patches`
    93 
    94   if [[ -s $BUILDDIR/sources/MISSING_FILES.DMP ]]; then
    95     echo  -e "\n\n${tab_}${RED} One or more files were not retrieved.\n${tab_} Check <MISSING_FILES.DMP> for names ${OFF}\n\n"
    96   fi
    97 }
    989
    9910

  • LFS/config

    rc03b616 r15cad16  
    66#
    77#####
    8 declare -r FTP=ftp://ftp.linuxfromscratch.org/pub/lfs/conglomeration
    98
    109#--- Location of fstab file (if empty, a template is created)
    … …  
    3332#--- Name of the makefile
    3433MKFILE=$JHALFSDIR/Makefile
    35 
    36 #--- FTP/HTTP mirror used as fallback (full path)
    37 SERVER=ftp://anduin.linuxfromscratch.org/LFS/conglomeration

  • common/common-functions

    rc03b616 r15cad16  
    522522}
    523523
    524 
    525 #----------------------------#
    526 build_patches_file() {       # Supply a suitably formated list of patches.
    527 #----------------------------#
    528   local saveIFS=$IFS
    529   local IFS
    530 
    531   rm -f patches
    532 
    533   LOC_add_patches_entry() {
    534     for f in `grep "/$1-" patcheslist_.wget`; do
    535       basename $f | sed "s|${2}|\&${1}-version;|" >> patches
    536     done
    537   }
    538 
    539   case ${PROGNAME} in
    540     hlfs)
    541          echo -n "Creating the HLFS ${L_arrow}${BOLD}$MODEL${R_arrow} specific patches file"
    542          xsltproc --nonet \
    543                   --xinclude \
    544                   --stringparam model $MODEL \
    545                   -o patcheslist_.wget \
    546                   patcheslist.xsl \
    547                   $BOOK/chapter04/patches.xml
    548                   #> /dev/null 2>&1
    549 
    550          # .... U G L Y .... what to do with the grsecurity patch to the kernel..
    551          for f in `grep "/grsecurity-" patcheslist_.wget`; do
    552            basename $f >> patches
    553          done
    554       ;;
    555 
    556     clfs)  # Pull out a list of arch specific patches
    557          echo -n "Creating CLFS ${L_arrow}${BOLD}$ARCH${R_arrow} specific patches file"
    558          xsltproc -xinclude  \
    559                   -o patcheslist_.wget \
    560                   patcheslist.xsl \
    561                   $BOOK/materials/${ARCH}-chapter.xml
    562       ;;
    563     *)  return
    564   esac
    565 
    566 
    567   IFS=$'\x0A'  # Modify the 'internal field separator' to break on 'LF' only
    568   for f in `cat packages`; do
    569     IFS=$saveIFS  # Restore the system defaults
    570     LOC_add_patches_entry \
    571     `echo $f | sed -e 's/-version//' \
    572                    -e 's/-file.*//' \
    573                    -e 's/"//g' \
    574                    -e 's/uclibc/uClibc/'`
    575   done
    576 
    577   rm -f patcheslist_.wget
    578 
    579   echo " ...OK"
    580 }
    581 
    582 
    583524#----------------------------#
    584525extract_commands() {         #
    585526#----------------------------#
    586   local saveIFS=$IFS
    587527
    588528  # Check for libxslt instead of just letting the script hit 'xsltproc' and fail.
    … …  
    648588                 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
    649589      ;;
    650     *) exit 1
     590    *) exit 1 ;;
    651591  esac
    652592
    … …  
    656596  chmod -R +x $JHALFSDIR/${PROGNAME}-commands
    657597
    658   # Grab the patches and package names.
    659   for i in patches packages ; do
    660     rm -f $i
    661   done
    662   #
     598  # Create the packages file. We need it for proper Makefile creation
     599  rm -f packages
    663600  case "${PROGNAME}" in
    664601    clfs)
    665       ################################
    666       # A LOCAL function
    667       # xx_.wget contains arch specific files but in URL format
    668       # Build a file with only arch specific files.. small ugly..
    669       LOC_add_packages_entry() {
    670         local fileMATCH aFILE
    671 
    672           # Deal with a non-standard format
    673         if [[ "$1" = "clfs-bootscripts" ]]; then
    674           set -- "bootscripts-cross-lfs" $2
    675         fi
    676         fileMATCH="/$1"
    677 
    678         # format.. Filename-Version  or FilenameVersion
    679         for aFILE in `grep ${fileMATCH}-*[[:digit:]] packageslist_.wget`; do
    680          # Block vim-x.x-lang file, will add it later based on config flag
    681          if [[ ! "${aFILE}" =~ "vim-$2-lang" ]]; then
    682            echo "$1-version \"$2\"" >> packages
    683          fi
    684         done
    685       }
    686       #################################
    687 
    688       # We only want a list arch specific files..
    689       # Unfortunately this script produces URL's which must be converted to a std format
    690       echo -n "Creating CLFS ${L_arrow}${BOLD}${ARCH}${R_arrow} specific packages file"
    691       xsltproc -xinclude  \
    692                -o packageslist_.wget \
    693                packageslist.xsl \
    694                $BOOK/materials/${ARCH}-chapter.xml
    695 
    696       # This has the correct format but contains packages from every book
     602      echo -n "Creating <${PROGNAME}> specific packages file"
    697603      grep "\-version " $BOOK/packages.ent | sed -e 's@<!ENTITY @@' \
    698604                                                 -e 's@">@"@' \
    699                                                  -e '/generic/d' > packages.tmp
    700       # This variable is necessary to make sure the `cat $JHALFSDIR/packages`
    701       # separates each iteration by lines.
    702       # Modify the 'internal field separator' to break on 'LF' only
    703       IFS=$'\x0A'
    704       for f in `cat packages.tmp`; do
    705         IFS=$saveIFS  # Restore the system defaults
    706         LOC_add_packages_entry \
    707         `echo $f | sed -e 's/-version//' \
    708                        -e 's/-file.*//' \
    709                        -e 's/"//g'`
    710      done
    711 
    712      rm -f packageslist_.wget packages.tmp
    713 
     605                                                 -e '/generic/d' > packages
    714606     echo " ...OK"
    715607     ;;
    … …  
    728620                                               -e 's@">@"@' \
    729621                                               -e '/generic/d' >> packages
    730       echo `grep "glibc" packages | sed 's@glibc@glibc-libidn@'` >> packages
    731       echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
    732622      echo " ...OK"
    733623      ;;
    734   esac
    735 
    736   # Download the vim-lang package if it must be installed
    737   if [ "$VIMLANG" = "1" ] && [ ! "$PROGNAME" = "hlfs" ] ; then
    738     echo `grep "vim" packages | sed 's@vim@&-lang@'` >> packages
    739   fi
    740 
    741   # Create the patches file
    742   case "${PROGNAME}" in
    743     hlfs)
    744       build_patches_file ;;
    745     clfs )
    746       build_patches_file ;;
    747     lfs)
    748       grep "^<\!ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches
    749       ;;
    750     blfs) ;;
    751     *) exit 1
    752624  esac
    753625
    … …  
    758630
    759631#----------------------------#
    760 download() {                 # Download file, write name to MISSING_FILES.DMP if an error
    761 #----------------------------#
    762   cd $BUILDDIR/sources
    763 
    764   # Hackish fix for the bash-doc, glibc-{linuxthreads,libidn}
    765   # that don't conform to norms in the URL scheme.
    766   DIR=`echo $1 | sed 's@-doc@@;s@-linuxthreads@@;s@-libidn@@;s@-testsuite@@'`
    767 
    768   # If the file exists in the archive copy it to the $BUILDDIR/sources dir
    769   # MD5SUM is assumed to be correct from previous download
    770   if [ ! -z ${SRC_ARCHIVE} ] &&
    771      [   -d ${SRC_ARCHIVE} ] &&
    772      [   -f ${SRC_ARCHIVE}/$2 ]; then
    773     cp ${SRC_ARCHIVE}/$2 .
    774     echo "$2: -- ok"
    775     return
    776   fi
    777 
    778   # Find the md5 sum for this package.
    779   if [ $2 != MD5SUMS ] ; then
    780     set +e
    781     MD5=`grep "  $2" MD5SUMS`
    782     if [ $? -ne 0 ]; then
    783       set -e
    784       echo "${RED}$2 not found in MD5SUMS${OFF}"
    785       echo "$2 not found in MD5SUMS" >> MISSING_FILES.DMP
    786       return
     632get_sources() {              # Download file, write name to MISSING_FILES.DMP if an error
     633#----------------------------#
     634  local saveIFS=$IFS
     635  local IFS line URL1 URL2 FILE MD5
     636
     637  # Test if the packages must be downloaded
     638  if [ "$GETPKG" = "1" ] ; then
     639
     640    [[ ! -d $BUILDDIR/sources ]] && mkdir $BUILDDIR/sources
     641    cd $BUILDDIR/sources
     642    [[ -f MD5SUMS ]] && rm MD5SUMS
     643    [[ -f MD5SUMS-$VERSION ]] && rm MD5SUMS-$VERSION
     644    [[ -f MISSING_FILES.DMP ]] && rm MISSING_FILES.DMP
     645    [[ -f urls.lst ]] && rm urls.lst
     646
     647    # Download a fresh MD5SUMS file
     648    wget $SERVER/pub/lfs/conglomeration/MD5SUMS
     649
     650    # Generate URLs file
     651    create_urls
     652
     653    IFS=$'\x0A'  # Modify the 'internal field separator' to break on 'LF' only
     654    for line in `cat urls.lst`; do
     655
     656      IFS=$saveIFS  # Restore the system defaults
     657      URL1=`echo $line | cut -d" " -f1` # Upstream URL
     658      URL2=`echo $line | cut -d" " -f2` # Fallback URL
     659      FILE=`basename $URL2` # File name
     660
     661      # If the file exists in the archive copy it to the $BUILDDIR/sources dir
     662      # MD5SUM is assumed to be correct from previous download
     663      if [ ! -z ${SRC_ARCHIVE} ] &&
     664         [ -d ${SRC_ARCHIVE} ] &&
     665         [ -f ${SRC_ARCHIVE}/$FILE ]; then
     666        cp ${SRC_ARCHIVE}/$FILE .
     667        echo "$FILE: -- copied from $SRC_ARCHIVE"
     668      fi
     669
     670      # Find the md5 sum for this package.
     671      set +e
     672      MD5=`grep "  $FILE" MD5SUMS`
     673      if [ $? -ne 0 ]; then
     674        set -e
     675        echo "${RED}$FILE not found in MD5SUMS${OFF}"
     676        echo "$FILE not found in MD5SUMS" >> MISSING_FILES.DMP
    787677      fi
    788678      set -e
     679
     680      if [ ! -f $FILE ] ; then
     681        wget $URL1 || wget $URL2
     682      elif ! echo "$MD5" | md5sum -c - >/dev/null 2>/dev/null ; then
     683        wget -N $URL1 || wget -N $URL2
     684      fi
     685
     686      if ! echo "$MD5" | md5sum -c - ; then
     687        exit 1
     688      fi
     689      echo `grep "$MD5" MD5SUMS` >> MD5SUMS-$VERSION
     690
     691      # Copy the freshly downloaded file
     692      # to the source archive.
     693      if [ ! -z ${SRC_ARCHIVE} ] &&
     694         [ -d ${SRC_ARCHIVE} ] &&
     695         [ -w ${SRC_ARCHIVE} ] &&
     696         [ ! -f ${SRC_ARCHIVE}/$FILE ] ; then
     697        echo "Store file:<$FILE> in package archive"
     698        cp -v $FILE ${SRC_ARCHIVE}
     699      fi
     700
     701    done
     702
    789703  fi
    790 
    791   if [ ! -f $2 ] ; then
    792     case $DL in
    793       wgetFTP )  wget --passive $FTP/$DIR/$2            ;;
    794       wget )  wget $HTTP/$DIR/$2            ;;
    795       curl )  `curl -# $FTP/$DIR/$2 -o $2`     ;;
    796       * )     echo "$DL not supported at this time."  ;;
    797     esac
    798   elif ! echo "$MD5" | md5sum -c - >/dev/null 2>/dev/null ; then
    799     case $DL in
    800       wgetFTP )  wget --passive -c $FTP/$DIR/$2         ;;
    801       wget )   wget -c $HTTP/$DIR/$2            ;;
    802       curl )  `curl -# -C - $FTP/$DIR/$2 -o $2`    ;;
    803       * )     echo "$DL not supported at this time."  ;;
    804     esac
    805   fi
    806 
    807   if [ $2 != MD5SUMS ] && ! echo "$MD5" | md5sum -c - ; then
    808     exit 1
    809   fi
    810   if [ $2 != MD5SUMS ] ; then
    811     echo `grep "$MD5" MD5SUMS` >> MD5SUMS-$VERSION
    812   fi
    813 
    814   # If we make it this far we should copy the freshly downloaded file
    815   # to the source archive.
    816   if [ ! -z ${SRC_ARCHIVE} ] &&
    817      [   -d ${SRC_ARCHIVE} ] &&
    818      [   -w ${SRC_ARCHIVE} ] &&
    819      [ $2 != MD5SUMS ]; then
    820        echo "Store file:<$2> in package archive"
    821        cp -v $2 ${SRC_ARCHIVE}
    822   fi
    823 
    824 }
    825 
    826 
    827 #----------------------------#
    828 get_sources() {
    829 #----------------------------#
    830 
    831   # Test if the packages must be downloaded
    832   if [ "$HPKG" = "1" ] ; then
    833 
    834     # This variable is necessary to make sure the `cat $JHALFSDIR/packages`
    835     # separates each iteration by lines.
    836     # Modify the 'internal field separator' to break on 'LF' only
    837     IFS=$'\x0A'
    838 
    839     if [ ! -d $BUILDDIR/sources ] ; then mkdir $BUILDDIR/sources ; fi
    840     cd $BUILDDIR/sources
    841     if [ -f MD5SUMS ] ; then rm MD5SUMS ; fi
    842     if [ -f MD5SUMS-$VERSION ] ; then rm MD5SUMS-$VERSION ; fi
    843     if [ -f MISSING_FILES.DMP ] ; then rm MISSING_FILES.DMP ; fi
    844 
    845     download "" MD5SUMS
    846 
    847     # Iterate through each package and grab it, along with any patches it needs.
    848     for i in `cat $JHALFSDIR/packages` ; do
    849       PKG=`echo $i | sed -e 's/-version.*//' -e 's/-file.*//'`
    850 
    851       # There are some entities that aren't valid packages.
    852       if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" ] ; then continue ; fi
    853 
    854       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
    855       case $PKG in
    856         tcl)         FILE="$PKG$VRS-src.tar.bz2"  ;;
    857         vim-lang)    PKG="vim"
    858                      FILE="vim-$VRS-lang.tar.bz2" ;;
    859         udev-config) PKG="udev"
    860                      FILE="$VRS"                  ;;
    861         *)           FILE="$PKG-$VRS.tar.bz2"     ;;
    862       esac
    863       download $PKG $FILE
    864 
    865       # Download any associated patches
    866       for patch in `grep "&$PKG-version" $JHALFSDIR/patches` ; do
    867         PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
    868         download $PKG $PATCH
    869       done
    870     done
    871     if [[ -s $BUILDDIR/sources/MISSING_FILES.DMP ]]; then
    872       echo  -e "\n\n${tab_}${RED} One or more files were not retrieved.\n${tab_} Check ${L_arrow}$BUILDDIR/sources/MISSING_FILES.DMP${R_arrow} for names ${OFF}\n\n"
    873     fi
    874   fi
    875 }
    876 
     704}
     705
     706
     707#----------------------------#
     708create_urls() {              #
     709#----------------------------#
     710  cd $JHALFSDIR
     711
     712  case ${PROGNAME} in
     713    clfs)
     714        echo -n "Creating CLFS <${ARCH}> specific URLs file"
     715        xsltproc --nonet --xinclude \
     716                 --stringparam server $SERVER \
     717                 -o $BUILDDIR/sources/urls.lst urls.xsl \
     718                 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
     719        echo " ...OK"
     720      ;;
     721    hlfs)
     722        echo -n "Creating HLFS <${MODEL}> specific URLs file"
     723        xsltproc --nonet --xinclude \
     724                 --stringparam server $SERVER \
     725                 --stringparam model $MODEL \
     726                 -o $BUILDDIR/sources/urls.lst urls.xsl \
     727                 $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
     728        echo " ...OK"
     729      ;;
     730    lfs)
     731        echo -n "Creating LFS specific URLs file"
     732        xsltproc --nonet --xinclude \
     733                 --stringparam server $SERVER \
     734                 -o ../sources/urls.lst urls.xsl \
     735                 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
     736        echo " ...OK"
     737      ;;
     738  esac
     739
     740  cd $BUILDDIR/sources
     741}

  • common/config

    rc03b616 r15cad16  
    88declare -r SVN="svn://svn.linuxfromscratch.org"
    99declare -r LOG=000-masterscript.log
    10 declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
    1110
    1211#--- Mount point for the build
    1312BUILDDIR=/mnt/build_dir
    1413
     14#=== Getting packages ===
     15#--- Download the source packages 0(no)/1(yes)
     16GETPKG=0
     17
    1518#--- The local repository for packages/file
    16 #    Used only if HPKG = 1
     19#    Used only if GETPKG = 1
    1720#    Any missing file will be downloaded and archived here,
    1821#    if the user has the right priviledges.
    1922SRC_ARCHIVE=$SRC_ARCHIVE
    2023
    21 #--- Download the source packages 0(no)/1(yes)
    22 HPKG=0
     24# --- Server used as fallback if the file isn't found in
     25# SRC_ARCHIVE and/or can't be dowloaded from upstream
     26SERVER=ftp://ftp.lfs-matrix.net
    2327
     28#=== Build options ===
    2429#--- Run the makefile at the end  0(no)/1(yes)
    2530#    In BLFS the Makefile can't be run automatically

  • common/func_validate_configs.sh

    rc03b616 r15cad16  
    8585
    8686  # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
    87   local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG         DEPEND                TEST"
    88   local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
    89   local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
    90   local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
     87  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG         DEPEND                TEST"
     88  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
     89  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
     90  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
    9191
    9292  local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    … …  
    178178
    179179      # Validate general parameters..
    180       HPKG)       validate_against_str "x0x x1x" ;;
     180      GETPKG)     validate_against_str "x0x x1x" ;;
    181181      RUNMAKE)    validate_against_str "x0x x1x" ;;
    182182      REPORT)     validate_against_str "x0x x1x"

  • common/urls.xsl

    rc03b616 r15cad16  
    4545        <xsl:value-of select="@url"/>
    4646      </xsl:if>
    47       <!-- Using a tab character as fields separator -->
    48       <xsl:text>        </xsl:text>
     47      <xsl:text> </xsl:text>
    4948      <xsl:value-of select="$server"/>
    5049      <xsl:text>/pub/lfs/conglomeration/</xsl:text>

  • master.sh

    rc03b616 r15cad16  
    149149      ;;
    150150
    151     --get-packages | -G )      HPKG=1    ;;
     151    --get-packages | -G )      GETPKG=1    ;;
    152152
    153153    --help | -h )  usage | more && exit  ;;
    … …  
    412412done
    413413
    414 # Find the download client to use, if not already specified.
    415 
    416 if [ -z $DL ] ; then
    417   if [ `type -p wget` ] ; then
    418     DL=wget
    419   elif [ `type -p curl` ] ; then
    420     DL=curl
    421   else
    422     eval "$no_dl_client"
    423   fi
    424 fi
    425 
    426414#===================================================
    427415# Set the document location...
    … …  
    492480  fi
    493481  [[ "$REPORT" = "1" ]] && cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
     482  [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
    494483  sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
    495484  export XSL=$JHALFSDIR/${XSL}
Note: See TracChangeset for help on using the changeset viewer.