r2626 - jhalfs/trunk/contrib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Wed May 3 10:28:05 PDT 2006


Author: manuel
Date: 2006-05-03 11:28:04 -0600 (Wed, 03 May 2006)
New Revision: 2626

Modified:
   jhalfs/trunk/contrib/jhalfs-paco.patch
Log:
Updated paco patch.

Modified: jhalfs/trunk/contrib/jhalfs-paco.patch
===================================================================
--- jhalfs/trunk/contrib/jhalfs-paco.patch	2006-05-03 09:34:13 UTC (rev 2625)
+++ jhalfs/trunk/contrib/jhalfs-paco.patch	2006-05-03 17:28:04 UTC (rev 2626)
@@ -1,8 +1,8 @@
 Index: LFS/master.sh
 ===================================================================
---- LFS/master.sh	(revision 2606)
+--- LFS/master.sh	(revision 2625)
 +++ LFS/master.sh	(working copy)
-@@ -183,6 +183,18 @@
+@@ -179,6 +179,18 @@
        *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
      esac
  
@@ -21,7 +21,7 @@
      # Grab the name of the target
      name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
  
-@@ -225,7 +237,9 @@
+@@ -221,7 +233,9 @@
      # and not to use chroot.
      case "${this_script}" in
        *kernfs)  wrt_run_as_root    "${this_script}" "$file" ;;
@@ -32,7 +32,7 @@
      esac
  
      # Remove the build directory(ies) except if the package build fails.
-@@ -245,6 +259,16 @@
+@@ -241,6 +255,16 @@
      PREV=${this_script}${N}
      # Set system_build envar for iteration targets
      system_build=$chapter6
@@ -49,7 +49,7 @@
    done # end for file in chapter06/*
  }
  
-@@ -306,6 +330,14 @@
+@@ -302,6 +326,14 @@
                  wrt_run_as_chroot2 "$this_script" "$file"
                fi
          ;;
@@ -66,7 +66,7 @@
      esac
 Index: LFS/lfs.xsl
 ===================================================================
---- LFS/lfs.xsl	(revision 2606)
+--- LFS/lfs.xsl	(revision 2625)
 +++ LFS/lfs.xsl	(working copy)
 @@ -32,6 +32,9 @@
    <!-- Locale settings -->
@@ -114,7 +114,7 @@
          <xsl:apply-templates/>
 Index: BLFS/master.sh
 ===================================================================
---- BLFS/master.sh	(revision 2606)
+--- BLFS/master.sh	(revision 2625)
 +++ BLFS/master.sh	(working copy)
 @@ -79,6 +79,19 @@
  EOF
@@ -136,9 +136,17 @@
      # Insert date and disk usage at the top of the log file, the script run
      # and date and disk usage again at the bottom of the log file.
  (
+@@ -88,6 +101,7 @@
+ 	echo -e "\n\`date\`\n\nKB: \`du -sk --exclude=logs/* /\`\n" >>logs/$this_script
+ EOF
+ ) >> $MKFILE
++    fi
+ 
+     # Include a touch of the target name so make can check
+     # if it's already been made.
 Index: BLFS/blfs.xsl
 ===================================================================
---- BLFS/blfs.xsl	(revision 2606)
+--- BLFS/blfs.xsl	(revision 2625)
 +++ BLFS/blfs.xsl	(working copy)
 @@ -159,7 +159,7 @@
          <xsl:when test="@role = 'nodump'"/>
@@ -167,7 +175,7 @@
 +make logme
 Index: common/config
 ===================================================================
---- common/config	(revision 2606)
+--- common/config	(revision 2625)
 +++ common/config	(working copy)
 @@ -80,6 +80,14 @@
  #--- Run farce testing 0(no)/1(yes)
@@ -196,7 +204,7 @@
 +LD_PRELOAD=/usr/lib/libpaco-log.so
 Index: common/func_validate_configs.sh
 ===================================================================
---- common/func_validate_configs.sh	(revision 2606)
+--- common/func_validate_configs.sh	(revision 2625)
 +++ common/func_validate_configs.sh	(working copy)
 @@ -84,10 +84,10 @@
  inline_doc
@@ -354,9 +362,9 @@
 +make logme
 Index: common/common-functions
 ===================================================================
---- common/common-functions	(revision 2606)
+--- common/common-functions	(revision 2625)
 +++ common/common-functions	(working copy)
-@@ -59,6 +59,9 @@
+@@ -60,6 +60,9 @@
          in the configuration file has the proper packages and patches for the
          book version being processed.
  
@@ -366,7 +374,7 @@
  ${BOLD}  -T, --testsuites N ${OFF}
          Run test suites  [0-3]
            0 = none
-@@ -566,6 +569,7 @@
+@@ -567,6 +570,7 @@
                   --stringparam lc_all $LC_ALL \
                   --stringparam keymap $KEYMAP \
                   --stringparam grsecurity_host $GRSECURITY_HOST \
@@ -374,7 +382,7 @@
                   -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
        ;;
      lfs)
-@@ -577,6 +581,7 @@
+@@ -578,6 +582,7 @@
                   --stringparam timezone $TIMEZONE \
                   --stringparam page $PAGE \
                   --stringparam lang $LANG \
@@ -384,7 +392,7 @@
      blfs)
 Index: HLFS/hlfs.xsl
 ===================================================================
---- HLFS/hlfs.xsl	(revision 2606)
+--- HLFS/hlfs.xsl	(revision 2625)
 +++ HLFS/hlfs.xsl	(working copy)
 @@ -39,6 +39,9 @@
    <xsl:param name="lang" select="en_CA"/>
@@ -435,7 +443,7 @@
          <xsl:apply-templates/>
 Index: HLFS/master.sh
 ===================================================================
---- HLFS/master.sh	(revision 2606)
+--- HLFS/master.sh	(revision 2625)
 +++ HLFS/master.sh	(working copy)
 @@ -253,6 +253,18 @@
        *-stripping* )  [[ "$STRIP" = "0" ]] && continue ;;
@@ -501,7 +509,7 @@
          ;;
 Index: master.sh
 ===================================================================
---- master.sh	(revision 2606)
+--- master.sh	(revision 2625)
 +++ master.sh	(working copy)
 @@ -70,6 +70,11 @@
  source $MODULE
@@ -513,7 +521,7 @@
 +[[ $? > 0 ]] && echo "$COMMON_DIR/paco-functions did not load.." && exit 2
 +[[ $VERBOSITY > 0 ]] && echo "OK"
  #
- [[ $VERBOSITY > 0 ]] && echo "---------------${nl_}"
+ [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
  
 @@ -152,6 +157,8 @@
  




More information about the alfs-log mailing list