From 89dffbf1c9f8d90db393faf644c253361dd57b3b Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sat, 14 Sep 2013 21:34:25 +0000 Subject: [PATCH] Merge trunk r3717 --- common/libs/func_download_pkgs | 22 ++-------------------- optimize/opt_config | 2 ++ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/common/libs/func_download_pkgs b/common/libs/func_download_pkgs index 3e07799..41e624e 100644 --- a/common/libs/func_download_pkgs +++ b/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) diff --git a/optimize/opt_config b/optimize/opt_config index 7c7711a..1e621cf 100644 --- a/optimize/opt_config +++ b/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;