r2984 - in jhalfs/trunk: . CLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Thu Aug 17 01:33:04 PDT 2006


Author: georgeb
Date: 2006-08-17 02:33:03 -0600 (Thu, 17 Aug 2006)
New Revision: 2984

Modified:
   jhalfs/trunk/CLFS/clfs.xsl
   jhalfs/trunk/master.sh
Log:
last of the missing menu vars

Modified: jhalfs/trunk/CLFS/clfs.xsl
===================================================================
--- jhalfs/trunk/CLFS/clfs.xsl	2006-08-17 08:19:41 UTC (rev 2983)
+++ jhalfs/trunk/CLFS/clfs.xsl	2006-08-17 08:33:03 UTC (rev 2984)
@@ -205,7 +205,7 @@
                 </xsl:when>
                 <xsl:otherwise>
                   <xsl:apply-templates/>
-                  <xsl:text> >> $TEST_LOG 2>&1&</xsl:text>
+                  <xsl:text> >> $TEST_LOG 2>&1</xsl:text>
                   <xsl:if test="contains(string(),' -k ')">
                     <xsl:text> || true</xsl:text>
                   </xsl:if>

Modified: jhalfs/trunk/master.sh
===================================================================
--- jhalfs/trunk/master.sh	2006-08-17 08:19:41 UTC (rev 2983)
+++ jhalfs/trunk/master.sh	2006-08-17 08:33:03 UTC (rev 2984)
@@ -44,7 +44,7 @@
   PACKAGE_DIR=$(echo $PROGNAME | tr [a-z] [A-Z])
        MODULE=$PACKAGE_DIR/master.sh
 MODULE_CONFIG=$PACKAGE_DIR/config
-    VERBOSITY=1
+    VERBOSITY=0
 
 
 if [[ -e using_menuconfig ]]; then
@@ -56,6 +56,9 @@
         #--- CONSTANTS
   declare -r SVN="svn://svn.linuxfromscratch.org"
   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
   SCRIPT_ROOT=jhalfs
     JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT
@@ -67,6 +70,7 @@
 	#--- farce report log directory
   FARCELOGDIR=$LOGDIR/farce
           XSL=$PROGNAME.xsl
+      PKG_LST=unpacked
 
   case $PROGNAME in
     clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;;




More information about the alfs-log mailing list