r2120 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Oct 15 12:58:52 PDT 2005


Author: manuel
Date: 2005-10-15 13:58:52 -0600 (Sat, 15 Oct 2005)
New Revision: 2120

Modified:
   jhalfs/trunk/jhalfs
Log:
Fixed some issues in the patches dowload code.

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-15 16:31:28 UTC (rev 2119)
+++ jhalfs/trunk/jhalfs	2005-10-15 19:58:52 UTC (rev 2120)
@@ -388,9 +388,9 @@
     for i in `cat $JHALFSDIR/packages` ; do
       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'`
+      GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | 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'`
+      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
@@ -404,7 +404,7 @@
       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@&'$PKG'-patch-version;@'$IPROUTE2PATCH'@'`
+          PATCH=`echo $patch | sed 's@&iproute2-patch-version;@'$IPROUTE2PATCH'@'`
           download $PKG $PATCH
         else
           PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
@@ -412,7 +412,7 @@
         fi
       done
       # Needed for Groff patchlevel patch on UTF-8 branch
-      for patch in `grep "$PKG_&$PKG" $JHALFSDIR/patches` ; do
+      for patch in `grep "patchlevel" $JHALFSDIR/patches` ; do
         PATCH=`echo $patch | sed 's@&'$PKG'-version;-&'$PKG'-patchlevel;@'$VRS'-'$GROFFLEVEL'@'`
         download $PKG $PATCH
       done




More information about the alfs-log mailing list