Changeset 3a27393 for common

Timestamp:

05/16/2006 06:27:02 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

25b52e2

Parents:

d68d2c1

Message:

Updated experimental to current trunk.

Location:

common

Files:

• common-functions (modified) (7 diffs)
• config (modified) (1 diff)
• func_validate_configs.sh (modified) (2 diffs)
• urls.xsl (modified) (2 diffs)

common/common-functions

@@ -613 +613 @@
   # Create the packages file. We need it for proper Makefile creation
   rm -f packages
-  case "${PROGNAME}" in
-    clfs)
-      echo -n "Creating <${PROGNAME}> specific packages file"
-      grep "\-version " $BOOK/packages.ent | sed -e 's@<!ENTITY @@' \
-                                                 -e 's@">@"@' \
-                                                 -e '/generic/d' > packages
-     echo " ...OK"
-     ;;
-
-    hlfs)
-      echo -n "Creating <${PROGNAME}> specific packages file"
-      grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' \
-                                               -e 's@">@"@' \
-                                               -e '/generic/d' >> packages
-      echo " ...OK"
-      ;;
-
-    lfs)
-      echo -n "Creating <${PROGNAME}> specific packages file"
-      grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' \
-                                               -e 's@">@"@' \
-                                               -e '/generic/d' >> packages
-      echo " ...OK"
-      ;;
-  esac
+  if [[ "${PROGNAME}" != "blfs" ]] ; then
+    echo -n "Creating <${PROGNAME}> specific packages file"
+    grep "\-version " $BOOK/packages.ent | sed -e 's@<!ENTITY @@' \
+                                                -e 's@">@"@' > packages
+    echo " ...OK"
+  fi
 
   # Done. Moving on...
@@ -660 +641 @@
   cd $BUILDDIR/sources
   [[ -f MD5SUMS ]] && rm MD5SUMS
-  [[ -f MD5SUMS-$VERSION ]] && rm MD5SUMS-$VERSION
   [[ -f MISSING_FILES.DMP ]] && rm MISSING_FILES.DMP
   [[ -f urls.lst ]] && rm urls.lst
-
-    # Download a fresh MD5SUMS file
-  wget $SERVER/pub/lfs/conglomeration/MD5SUMS
 
     # Generate URLs file
@@ -682 +659 @@
             [[ "$VIMLANG" = "0" ]] && continue
           ;;
+        *linux/linux-* )
+            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && continue
+          ;;
     esac
 
@@ -690 +670 @@
     BOOKMD5=`echo $line | cut -d" " -f3` # MD5 book value
 
-    if [[ x"$BOOKMD5" != "x" ]]; then
-      HAVEMD5=1
-      MD5="$BOOKMD5  $FILE"
-    else
-      # Find the md5 sum for this package in the server MD5SUMS file.
-      set +e
-      HAVEMD5=1  # Always assume we have a MD5SUM
-      MD5=`grep "  $FILE" MD5SUMS`
-      if [ $? -ne 0 ]; then
-        set -e
-        gs_wrt_message "$FILE not found in MD5SUMS"
-          # IMPORTANT:: There is no MD5SUM for this file.
-        HAVEMD5=0
-      fi
-    fi
+      # Validation pair
+    MD5="$BOOKMD5  $FILE"
+    HAVEMD5=1
 
     set -e
@@ -718 +686 @@
       echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE}${OFF}"
       fromARCHIVE=0
-      # If the file does not exist in /sources download a fresh one
+      # If the file does not exist yet in /sources download a fresh one
       if [ ! -f $FILE ] ; then
         if ! wget $URL1 && ! wget $URL2 ; then
@@ -727 +695 @@
     fi
 
-      # Is there a MD5SUM to validate the file against.
-    if [[ "$HAVEMD5" = "1" ]] ; then
-        # IF the md5sum does not match the existing files
-      if ! echo "$MD5" | md5sum -c - >/dev/null ; then
-        [[ $fromARCHIVE = "1" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match SRC_ARCHIVE copy${OFF}"
-        [[ $fromARCHIVE = "0" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match REMOTE copy${OFF}"
-          # Remove the old file and download a new one
-        rm -fv $FILE
-          # Force generation of MD5SUM and storage in SRC_ARCHIVE
-        fromARCHIVE=0;
-          # Try and retrieve the file. Servers in reverse order.
-        if ! wget $URL2 && ! wget $URL1 ; then
-          gs_wrt_message "$FILE not found on the servers.. SKIPPING"
-          continue
-        fi
+      # IF the md5sum does not match the existing files
+    if ! echo "$MD5" | md5sum -c - >/dev/null ; then
+      [[ $fromARCHIVE = "1" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match SRC_ARCHIVE copy${OFF}"
+      [[ $fromARCHIVE = "0" ]] && echo "${BOLD}${YELLOW}MD5SUM did not match REMOTE copy${OFF}"
+        # Remove the old file and download a new one
+      rm -fv $FILE
+        # Force storage in SRC_ARCHIVE
+      fromARCHIVE=0;
+        # Try to retrieve again the file. Servers in reverse order.
+      if ! wget $URL2 && ! wget $URL1 ; then
+        gs_wrt_message "$FILE not found on the servers.. SKIPPING"
+        continue
       fi
     fi
 
       # Validate the MD5SUM one last time
-    if [[ "$HAVEMD5" = "1" ]] && ! echo "$MD5" | md5sum -c - >/dev/null ; then
+    if ! echo "$MD5" | md5sum -c - >/dev/null ; then
       gs_wrt_message "$FILE does not match MD5SUMS value"
       # Force generation of MD5SUM
@@ -755 +720 @@
     if [[ "$HAVEMD5" = "0" ]] ; then
       echo "${BOLD}${YELLOW}Generating a new MD5SUM for ${OFF}$FILE"
-      echo "NEW MD5SUM $(md5sum $FILE)" >> MISSING_FILES.DMP
+      echo "NEW MD5SUM: $(md5sum $FILE)" >> MISSING_FILES.DMP
     fi
 
       # Good or bad we write the original md5sum to a file
-    echo "$MD5" >> MD5SUMS-$VERSION
+    echo "$MD5" >> MD5SUMS
 
      # Copy the freshly downloaded file

common/config

@@ -61 +61 @@
 
 #--- set default timezone.
-TIMEZONE=GMT
+TIMEZONE=${TZ:-GMT}
 
 #--- install the optional vim-lang package  0(no)/1(yes)

common/func_validate_configs.sh

@@ -170 +170 @@
     # This is a tricky little piece of code.. executes a cmd string.
     case $config_param in
-      BUILDDIR) # We cannot have an <empty> or </> root mount point
-                  echo -e "`eval echo $PARAM_VALS`"
-                  [[ "xx x/x" =~ "x${!config_param}x" ]] &&
-                       write_error_and_die
-                  ;;
       TIMEZONE)   echo -e "`eval echo $PARAM_VALS`" ;;
 
@@ -228 +223 @@
       #  warning -z+   -w+
       SRC_ARCHIVE) validate_dir -z+ -d -w+ ;;
+      BUILDDIR)   # The build directory/partition MUST exist and be writable by the user
+                  validate_dir -z -d -w
+                  [[ "xx x/x" =~ "x${!config_param}x" ]] &&
+                       write_error_and_die
+                  ;;
 
       # Validate files, testable states:

common/urls.xsl

@@ -55 +55 @@
       <xsl:text>/pub/lfs/conglomeration/</xsl:text>
       <xsl:choose>
-        <!-- Fix some directories. Test against dirname to be sure that we
-        are matching the start of a package name, not a string in a patch name -->
+        <!-- Fix some directories. Test against $dirname to be sure that we
+        are matching the start of a package name, not a string in a patch name
+        But some packages requires test against $package. -->
         <xsl:when test="contains($dirname, 'bash')">
           <xsl:text>bash/</xsl:text>
+        </xsl:when>
+        <xsl:when test="contains($package, 'dvhtool')">
+          <xsl:text>dvhtool/</xsl:text>
         </xsl:when>
         <xsl:when test="contains($dirname, 'gcc')">
@@ -66 +70 @@
           <xsl:text>glibc/</xsl:text>
         </xsl:when>
-        <xsl:when test="contains($dirname, 'tcl')">
+        <xsl:when test="contains($package, 'powerpc-utils')">
+          <xsl:text>powerpc-utils/</xsl:text>
+        </xsl:when>
+        <xsl:when test="contains($package, 'tcl')">
           <xsl:text>tcl/</xsl:text>
         </xsl:when>