r2270 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Jan 7 05:32:15 PST 2006


Author: manuel
Date: 2006-01-07 06:32:13 -0700 (Sat, 07 Jan 2006)
New Revision: 2270

Modified:
   jhalfs/trunk/jhalfs
Log:
Some fixes not full tested yet: Removed all 6.1.1-related code (that LFS version is supported only by jhalfs-0.2) and the i18n branch has been merged to trunk.

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-12-29 15:43:42 UTC (rev 2269)
+++ jhalfs/trunk/jhalfs	2006-01-07 13:32:13 UTC (rev 2270)
@@ -183,8 +183,6 @@
            svn co $SVN/LFS/trunk/BOOK lfs-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
 	alphabetical)
            svn co $SVN/LFS/branches/$LFSVRS/BOOK lfs-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
-	6.1.1)
-           svn co $SVN/LFS/tags/$LFSVRS/BOOK lfs-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
       esac
       echo -ne "done\n"
       # Set the canonical book version
@@ -231,19 +229,7 @@
     echo `grep "vim" packages | sed 's at vim@&-lang@'` >> packages
   fi
   echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
-  # These two packages are needed only for 6.1.1
-  if [ "$LFSVRS" = "6.1.1" ] ; then
-    echo `grep "glibc" packages | sed 's at glibc@&-linuxthreads@'` >> packages
-    # Download the module-init-tools-testsuite package only
-    # if the test suite is to be run.
-    if [ "$TEST" = "1" ] ; then
-      echo `grep "module" packages | sed 's at tools@&-testsuite@'` >> packages
-    fi
-  fi
-  # If we are buildind the UTF-8 branch, the glibc-libidn package is required
-  if grep -q "man-db-version" $BOOK/general.ent ; then
-    echo `grep "glibc" packages | sed 's at glibc@glibc-libidn@'` >> packages
-  fi
+  echo `grep "glibc" packages | sed 's at glibc@glibc-libidn@'` >> packages
   grep "ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches
 
   # Done. Moving on...
@@ -259,7 +245,7 @@
   # Hackish fix for the bash-doc, glibc-{linuxthreads,libidn} and
   # module-init-tools-testsuite packages that don't conform to
   # norms in the URL scheme.
-  DIR=`echo $1 | sed 's at -doc@@;s at -linuxthreads@@;s at -libidn@@;s at -testsuite@@'`
+  DIR=`echo $1 | sed 's at -doc@@;s at -libidn@@'`
 
   # Find the md5 sum for this package.
   if [ $2 != MD5SUMS ] ; then MD5=`grep "  $2" MD5SUMS` ; fi
@@ -320,7 +306,7 @@
     # Iterate through each package and grab it, along with any patches it needs.
     for i in `cat $JHALFSDIR/packages` ; do
       PKG=`echo $i | sed -e 's/-version.*//' -e 's/-file.*//'`
-      # Needed for Groff patchlevel patch on UTF-8 branch
+      # Needed for Groff patchlevel patch
       GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'`
 
       # There are some entities that aren't valid packages.
@@ -343,7 +329,7 @@
         PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
         download $PKG $PATCH
       done
-      # Needed for Groff patchlevel patch on UTF-8 branch
+      # Needed for Groff patchlevel patch
       for patch in `grep "patchlevel" $JHALFSDIR/patches` ; do
         PATCH=`echo $patch | sed 's@&'$PKG'-version;-&'$PKG'-patchlevel;@'$VRS'-'$GROFFLEVEL'@'`
         download $PKG $PATCH




More information about the alfs-log mailing list