r2160 - jhalfs/branches/0.2

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Nov 5 03:02:38 PST 2005


Author: manuel
Date: 2005-11-05 04:02:30 -0700 (Sat, 05 Nov 2005)
New Revision: 2160

Modified:
   jhalfs/branches/0.2/dump-lfs-scripts.xsl
   jhalfs/branches/0.2/jhalfs
Log:
Merged r2158 and r2159 from trunk.

Modified: jhalfs/branches/0.2/dump-lfs-scripts.xsl
===================================================================
--- jhalfs/branches/0.2/dump-lfs-scripts.xsl	2005-11-05 10:59:23 UTC (rev 2159)
+++ jhalfs/branches/0.2/dump-lfs-scripts.xsl	2005-11-05 11:02:30 UTC (rev 2160)
@@ -115,9 +115,10 @@
         <xsl:text>make mrproper&#xA;</xsl:text>
         <xsl:text>cp -v ../kernel-config .config&#xA;</xsl:text>
       </xsl:when>
-      <!-- The Coreutils test suite is optional -->
+      <!-- The Coreutils and Module-Init-Tools test suites are optional -->
       <xsl:when test="$testsuite = '0' and
-                ancestor::sect1[@id='ch-system-coreutils'] and
+                (ancestor::sect1[@id='ch-system-coreutils'] or
+                ancestor::sect1[@id='ch-system-module-init-tools']) and
                 (contains(string(),'check') or
                 contains(string(),'dummy'))"/>
       <!-- Fixing toolchain test suites run -->

Modified: jhalfs/branches/0.2/jhalfs
===================================================================
--- jhalfs/branches/0.2/jhalfs	2005-11-05 10:59:23 UTC (rev 2159)
+++ jhalfs/branches/0.2/jhalfs	2005-11-05 11:02:30 UTC (rev 2160)
@@ -170,8 +170,13 @@
   for i in patches packages ; do rm -f $i ; done
   grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
   -e '/generic/d' >> packages
-  echo `grep "glibc" packages | sed 's at glibc@glibc-linuxthreads@'` >> packages
+  echo `grep "glibc" packages | sed 's at glibc@&-linuxthreads@'` >> packages
   echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
+  # Download the module-init-tools-testsuite package only 
+  # if the test suite will be run.
+  if [ "$TEST" = "1" ] ; then
+    echo `grep "module" packages | sed 's at tools@&-testsuite@'` >> packages
+  fi
   # If we are buildind the UTF-8 branch, the glibc-libidn package is required
   if grep -q "man-db-version" $BOOK/general.ent ; then
     echo `grep "glibc" packages | sed 's at glibc@glibc-libidn@'` >> packages
@@ -188,9 +193,10 @@
 #----------------------------#
   cd $BUILDDIR/sources
 
-  # Hackish fix for the bash-doc and glibc-{linuxthreads,libidn} packages that
-  # doesn't conform to norms in the URL scheme.
-  DIR=`echo $1 | sed -e 's at -doc@@' -e 's at -linuxthreads@@' -e 's at -libidn@@'`
+  # 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@@';'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




More information about the alfs-log mailing list