diff --git a/jhalfs b/jhalfs index 7668784..f9dbd44 100755 --- a/jhalfs +++ b/jhalfs @@ -90,6 +90,9 @@ while test $# -gt 0 ; do 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 @@ get_sources() { 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 @@ get_sources() { 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