r3717 - in jhalfs/trunk: common/libs optimize

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sat Sep 14 14:23:16 PDT 2013


Author: pierre
Date: Sat Sep 14 14:23:16 2013
New Revision: 3717

Log:
Fix missing BOOK/materials and add libee to
MAKEFLAGS blacklist

Modified:
   jhalfs/trunk/common/libs/func_download_pkgs
   jhalfs/trunk/optimize/opt_config

Modified: jhalfs/trunk/common/libs/func_download_pkgs
==============================================================================
--- jhalfs/trunk/common/libs/func_download_pkgs	Sat Sep 14 04:16:02 2013	(r3716)
+++ jhalfs/trunk/common/libs/func_download_pkgs	Sat Sep 14 14:23:16 2013	(r3717)
@@ -146,31 +146,13 @@
   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)

Modified: jhalfs/trunk/optimize/opt_config
==============================================================================
--- jhalfs/trunk/optimize/opt_config	Sat Sep 14 04:16:02 2013	(r3716)
+++ jhalfs/trunk/optimize/opt_config	Sat Sep 14 14:23:16 2013	(r3717)
@@ -18,6 +18,8 @@
 #    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;



More information about the alfs-log mailing list