Changeset aebe03a

Timestamp:

10/15/2005 04:31:28 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

0.2, 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

8742984

Parents:

fd691b4

Message:

Adding support for LFS-6.1.1

File:

• jhalfs (modified) (3 diffs)

jhalfs

@@ -90 +90 @@
         dev* | SVN | trunk )
           LFSVRS=development
+          ;;
+        testing | 6.1.1 )
+          LFSVRS=6.1.1
           ;;
         * )
@@ -387 +390 @@
       # Needed for Groff patchlevel patch on UTF-8 branch
       GROFFLEVEL=`echo $i | sed -e 's/groff-patchlevel //' -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
+      # Needed for IPRoute2 patch on 6.1.1 book
+      IPROUTE2PATCH=`echo $i | sed -e 's/iproute2-patch-version //' -e 's/"//g'`
+
+      # 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'`
@@ -399 +404 @@
       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