r2119 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Oct 15 09:31:30 PDT 2005


Author: manuel
Date: 2005-10-15 10:31:28 -0600 (Sat, 15 Oct 2005)
New Revision: 2119

Modified:
   jhalfs/trunk/jhalfs
Log:
Adding support for LFS-6.1.1

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-15 15:40:23 UTC (rev 2118)
+++ jhalfs/trunk/jhalfs	2005-10-15 16:31:28 UTC (rev 2119)
@@ -90,6 +90,9 @@
         dev* | SVN | trunk )
           LFSVRS=development
           ;;
+        testing | 6.1.1 )
+          LFSVRS=6.1.1
+          ;;
         * )
           echo "$1 is an unsupported version at this time."
           exit 1
@@ -386,9 +389,11 @@
       PKG=`echo $i | sed 's/-version.*//'`
       # Needed for Groff patchlevel patch on UTF-8 branch
       GROFFLEVEL=`echo $i | sed -e 's/groff-patchlevel //' -e 's/"//g'`
+      # Needed for IPRoute2 patch on 6.1.1 book
+      IPROUTE2PATCH=`echo $i | sed -e 's/iproute2-patch-version //' -e 's/"//g'`
 
-      # Someone used some silly entities right next to the valid package entities.
-      if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi
+      # There is some entities that aren't valid package entities.
+      if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" -o "$PKG" = "iproute2-patch" ] ; then continue ; fi
 
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
       if [ "$PKG" = "tcl" ] ; then
@@ -398,8 +403,13 @@
       fi
       download $PKG $FILE
       for patch in `grep "$PKG-&$PKG" $JHALFSDIR/patches` ; do
-        PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
-        download $PKG $PATCH
+        if [ "$patch" = "iproute2-&iproute2-patch-version;-remove_db-1.patch" ] ; then
+          PATCH=`echo $patch | sed 's@&'$PKG'-patch-version;@'$IPROUTE2PATCH'@'`
+          download $PKG $PATCH
+        else
+          PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
+          download $PKG $PATCH
+        fi
       done
       # Needed for Groff patchlevel patch on UTF-8 branch
       for patch in `grep "$PKG_&$PKG" $JHALFSDIR/patches` ; do




More information about the alfs-log mailing list