Merge trunk r3717

common/libs/func_download_pkgs

@@ -146,31 +146,13 @@ create_urls() {              #
   cd $JHALFSDIR
 
   case ${PROGNAME} in
-    clfs)
+    clfs*)
         echo -n "Creating CLFS <${ARCH}> specific URLs file"
         xsltproc --nonet --xinclude \
                  --stringparam server $SERVER \
                  --stringparam family clfs \
                  -o $BUILDDIR/sources/urls.lst urls.xsl \
-                 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
-        echo " ...OK"
-      ;;
-    clfs2)
-        echo -n "Creating CLFS2 <${ARCH}> specific URLs file"
-        xsltproc --nonet --xinclude \
-                 --stringparam server $SERVER \
-                 --stringparam family clfs \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
-                 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
-        echo " ...OK"
-      ;;
-    clfs3)
-        echo -n "Creating CLFS3 <${ARCH}> specific URLs file"
-        xsltproc --nonet --xinclude \
-                 --stringparam server $SERVER \
-                 --stringparam family clfs \
-                 -o $BUILDDIR/sources/urls.lst urls.xsl \
-                 $BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
+                 $BOOK/BOOK/materials/$ARCH-chapter.xml >>$LOGDIR/$LOG 2>&1
         echo " ...OK"
       ;;
     hlfs)

optimize/opt_config

@@ -18,6 +18,8 @@ MAKEFLAGS="-j3"
 #    a empty list here.
 BLACK_LIST="attr autoconf coreutils dejagnu gettext gperf groff man-db vim"
 #    Rationale for attr, coreutils, gperf: the tests do not pass with -jX
+#    CLFS packages
+BLACK_LIST="$BLACK_LIST libee"
 
 #--- Default optimization mode
 #    This mode is overridden by definitions in opt_override;