Merge trunk r3717
This commit is contained in:
parent
6bcf33e8c6
commit
89dffbf1c9
2 changed files with 4 additions and 20 deletions
|
@ -146,31 +146,13 @@ create_urls() { #
|
||||||
cd $JHALFSDIR
|
cd $JHALFSDIR
|
||||||
|
|
||||||
case ${PROGNAME} in
|
case ${PROGNAME} in
|
||||||
clfs)
|
clfs*)
|
||||||
echo -n "Creating CLFS <${ARCH}> specific URLs file"
|
echo -n "Creating CLFS <${ARCH}> specific URLs file"
|
||||||
xsltproc --nonet --xinclude \
|
xsltproc --nonet --xinclude \
|
||||||
--stringparam server $SERVER \
|
--stringparam server $SERVER \
|
||||||
--stringparam family clfs \
|
--stringparam family clfs \
|
||||||
-o $BUILDDIR/sources/urls.lst urls.xsl \
|
-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"
|
|
||||||
;;
|
|
||||||
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
|
|
||||||
echo " ...OK"
|
echo " ...OK"
|
||||||
;;
|
;;
|
||||||
hlfs)
|
hlfs)
|
||||||
|
|
|
@ -18,6 +18,8 @@ MAKEFLAGS="-j3"
|
||||||
# a empty list here.
|
# a empty list here.
|
||||||
BLACK_LIST="attr autoconf coreutils dejagnu gettext gperf groff man-db vim"
|
BLACK_LIST="attr autoconf coreutils dejagnu gettext gperf groff man-db vim"
|
||||||
# Rationale for attr, coreutils, gperf: the tests do not pass with -jX
|
# Rationale for attr, coreutils, gperf: the tests do not pass with -jX
|
||||||
|
# CLFS packages
|
||||||
|
BLACK_LIST="$BLACK_LIST libee"
|
||||||
|
|
||||||
#--- Default optimization mode
|
#--- Default optimization mode
|
||||||
# This mode is overridden by definitions in opt_override;
|
# This mode is overridden by definitions in opt_override;
|
||||||
|
|
Reference in a new issue