zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

last of the missing menu vars

Browse source
This commit is contained in:
George Boudreau 2006-08-17 08:33:03 +00:00
parent d2f9373784
commit 30149286ce
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CLFS/clfs.xsl
View file

@ -205,7 +205,7 @@
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:apply-templates/> <xsl:apply-templates/>
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1&</xsl:text> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text>
<xsl:if test="contains(string(),' -k ')"> <xsl:if test="contains(string(),' -k ')">
<xsl:text> || true</xsl:text> <xsl:text> || true</xsl:text>
</xsl:if> </xsl:if>

6
master.sh
View file

@ -44,7 +44,7 @@ fi
PACKAGE_DIR=$(echo $PROGNAME | tr [a-z] [A-Z]) PACKAGE_DIR=$(echo $PROGNAME | tr [a-z] [A-Z])
MODULE=$PACKAGE_DIR/master.sh MODULE=$PACKAGE_DIR/master.sh
MODULE_CONFIG=$PACKAGE_DIR/config MODULE_CONFIG=$PACKAGE_DIR/config
VERBOSITY=1 VERBOSITY=0
if [[ -e using_menuconfig ]]; then if [[ -e using_menuconfig ]]; then
@ -56,6 +56,9 @@ if [[ -e using_menuconfig ]]; then
#--- CONSTANTS #--- CONSTANTS
declare -r SVN="svn://svn.linuxfromscratch.org" declare -r SVN="svn://svn.linuxfromscratch.org"
declare -r LOG=000-masterscript.log declare -r LOG=000-masterscript.log
# --- Server used if the file isn't found in SRC_ARCHIVE.
# As a last resort, the file will dowloaded from upstream, if possible.
SERVER=ftp://ftp.lfs-matrix.net
#--- Working directories #--- Working directories
SCRIPT_ROOT=jhalfs SCRIPT_ROOT=jhalfs
JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT
@ -67,6 +70,7 @@ if [[ -e using_menuconfig ]]; then
#--- farce report log directory #--- farce report log directory
FARCELOGDIR=$LOGDIR/farce FARCELOGDIR=$LOGDIR/farce
XSL=$PROGNAME.xsl XSL=$PROGNAME.xsl
PKG_LST=unpacked
case $PROGNAME in case $PROGNAME in
clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;; clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;;