Changeset 7ad4ef5 for jhalfs

Timestamp:

11/05/2005 11:02:30 AM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

0.2

Children:

7f49a8c

Parents:

0b02bb1

Message:

Merged r2158 and r2159 from trunk.

File:

• jhalfs (modified) (2 diffs)

jhalfs

@@ -171 +171 @@
   grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
   -e '/generic/d' >> packages
-  echo `grep "glibc" packages | sed 's@glibc@glibc-linuxthreads@'` >> packages
+  echo `grep "glibc" packages | sed 's@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@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
@@ -189 +194 @@
   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@-doc@@' -e 's@-linuxthreads@@' -e 's@-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@-doc@@';'s@-linuxthreads@@';'s@-libidn@@';'s@-testsuite@@'`
 
   # Find the md5 sum for this package.