Changeset 7d4b863

Timestamp:

10/24/2005 07:52:18 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:

b33e1d7

Parents:

e1093cd

Message:

The remove_db patch for IPRoute2 has been changed by a sed command in the 6.1.1 testing branch.

File:

• jhalfs (modified) (2 diffs)

jhalfs

@@ -245 +245 @@
       # Needed for Groff patchlevel patch on UTF-8 branch
       GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'`
-      # Needed for IPRoute2 patch on 6.1.1 book
-      IPROUTE2PATCH=`grep "iproute2-patch" $JHALFSDIR/packages | 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
+      if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi
 
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
@@ -259 +257 @@
       download $PKG $FILE
       for patch in `grep "$PKG-&$PKG" $JHALFSDIR/patches` ; do
-        if [ "$patch" = "iproute2-&iproute2-patch-version;-remove_db-1.patch" ] ; then
-          PATCH=`echo $patch | sed 's@&iproute2-patch-version;@'$IPROUTE2PATCH'@'`
-          download $PKG $PATCH
-        else
-          PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
-          download $PKG $PATCH
-        fi
+        PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
+        download $PKG $PATCH
       done
       # Needed for Groff patchlevel patch on UTF-8 branch