Changeset 3d82fb5

Timestamp:

01/07/2006 01:32:13 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:

cf9cac8

Parents:

ff4cb2e

Message:

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.

File:

• jhalfs (modified) (5 diffs)

jhalfs

@@ -184 +184 @@
         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"
@@ -232 +230 @@
   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@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@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@glibc@glibc-libidn@'` >> packages
-  fi
+  echo `grep "glibc" packages | sed 's@glibc@glibc-libidn@'` >> packages
   grep "ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches
 
@@ -260 +246 @@
   # module-init-tools-testsuite packages that don't conform to
   # norms in the URL scheme.
-  DIR=`echo $1 | sed 's@-doc@@;s@-linuxthreads@@;s@-libidn@@;s@-testsuite@@'`
+  DIR=`echo $1 | sed 's@-doc@@;s@-libidn@@'`
 
   # Find the md5 sum for this package.
@@ -321 +307 @@
     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'`
 
@@ -344 +330 @@
         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'@'`