Changeset aecc799 for jhalfs

Timestamp:

11/27/2005 10:10:28 AM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

0.2

Children:

0d5eabf, d494c36

Parents:

dc1a4e5

Message:

Merged r2226 from trunk.

File:

• jhalfs (modified) (2 diffs)

jhalfs

@@ -222 +222 @@
   grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
   -e '/generic/d' >> packages
-  echo `grep "glibc" packages | sed 's@glibc@&-linuxthreads@'` >> packages
   # Download the vim-lang package if it must be installed
   if [ "$VIMLANG" = "1" ] ; then
@@ -228 +227 @@
   fi
   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
+  # This two packages are needed only for 6.1.1
+  if [ "$LFSVRS" = "6.1.1" ] ; then
+    echo `grep "glibc" packages | sed 's@glibc@&-linuxthreads@'` >> 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
   fi
   # If we are buildind the UTF-8 branch, the glibc-libidn package is required