r2177 - jhalfs/branches/0.2

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Nov 12 17:44:11 PST 2005


Author: jhuntwork
Date: 2005-11-12 18:44:10 -0700 (Sat, 12 Nov 2005)
New Revision: 2177

Modified:
   jhalfs/branches/0.2/jhalfs
   jhalfs/branches/0.2/jhalfs.conf
Log:
Merged revisions 2175, 2176 to branches/0.2

Modified: jhalfs/branches/0.2/jhalfs
===================================================================
--- jhalfs/branches/0.2/jhalfs	2005-11-13 01:41:41 UTC (rev 2176)
+++ jhalfs/branches/0.2/jhalfs	2005-11-13 01:44:10 UTC (rev 2177)
@@ -196,7 +196,7 @@
   # Hackish fix for the bash-doc, glibc-{linuxthreads,libidn} and
   # module-init-tools-testsuite packages that doesn't conform to 
   # norms in the URL scheme.
-  DIR=`echo $1 | sed 's at -doc@@' -e 's at -linuxthreads@@' -e 's at -libidn@@' -e 's at -testsuite@@'`
+  DIR=`echo $1 | sed 's at -doc@@;s at -linuxthreads@@;s at -libidn@@;s at -testsuite@@'`
 
   # Find the md5 sum for this package.
   if [ $2 != MD5SUMS ] ; then MD5=`grep "  $2" MD5SUMS` ; fi
@@ -875,6 +875,10 @@
         testing | 6.1.1 )
           LFSVRS=6.1.1
           ;;
+	
+	alpha*)
+	  LFSVRS=alphabetical
+	  ;;
         * )
           echo "$1 is an unsupported version at this time."
           exit 1

Modified: jhalfs/branches/0.2/jhalfs.conf
===================================================================
--- jhalfs/branches/0.2/jhalfs.conf	2005-11-13 01:41:41 UTC (rev 2176)
+++ jhalfs/branches/0.2/jhalfs.conf	2005-11-13 01:44:10 UTC (rev 2177)
@@ -5,7 +5,7 @@
 #####
 
 declare -r SVN="svn://svn.linuxfromscratch.org"
-declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration
+declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
 declare -r XSL=dump-lfs-scripts.xsl
 declare -r LOG=000-jhalfs.log
 




More information about the alfs-log mailing list