Changeset 9b09518 for contrib

Timestamp:

07/30/2006 03:00:54 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

8715be1

Parents:

b2489fb

Message:

Updated paco patch from upstream.

File:

• contrib/jhalfs-paco.patch (modified) (26 diffs)

contrib/jhalfs-paco.patch

@@ -1 +1 @@
 Index: LFS/master.sh
 ===================================================================
---- LFS/master.sh       (revision 2829)
+--- LFS/master.sh       (revision 2861)
 +++ LFS/master.sh       (working copy)
-@@ -176,6 +176,11 @@
+@@ -173,6 +173,11 @@
      # Keep the script file name
      this_script=`basename $file`
@@ -15 +15 @@
      # dependencies and target creation.
      case "${this_script}" in
-@@ -183,6 +188,18 @@
+@@ -180,6 +185,18 @@
        *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
      esac
@@ -34 +34 @@
      name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
  
-@@ -235,7 +252,9 @@
+@@ -232,7 +249,9 @@
      # and not to use chroot.
      case "${this_script}" in
@@ -45 +45 @@
  
      # Remove the build directory(ies) except if the package build fails.
-@@ -255,6 +274,16 @@
+@@ -252,6 +271,16 @@
      PREV=${this_script}${N}
      # Set system_build envar for iteration targets
@@ -62 +62 @@
  }
  
-@@ -315,8 +344,18 @@
+@@ -312,8 +341,18 @@
                else
                  wrt_run_as_chroot2 "$this_script" "$file"
@@ -83 +83 @@
 Index: LFS/lfs.xsl
 ===================================================================
---- LFS/lfs.xsl (revision 2829)
+--- LFS/lfs.xsl (revision 2861)
 +++ LFS/lfs.xsl (working copy)
 @@ -32,6 +32,9 @@
@@ -95 +95 @@
      <xsl:apply-templates select="//sect1"/>
    </xsl:template>
-@@ -200,6 +203,33 @@
+@@ -206,6 +209,33 @@
          <xsl:apply-templates/>
          <xsl:text> || true&#xA;</xsl:text>
@@ -148 +148 @@
 Index: common/config
 ===================================================================
---- common/config       (revision 2829)
+--- common/config       (revision 2861)
 +++ common/config       (working copy)
 @@ -86,6 +86,14 @@
@@ -157 +157 @@
 +#--- Use paco? 0(no)/1(yes)
 +USE_PACO=1
-+PACO_VERSION=1.10.8
++PACO_VERSION=1.10.10
 +
 +#--- Name of the Paco source package
@@ -177 +177 @@
 Index: common/func_validate_configs.sh
 ===================================================================
---- common/func_validate_configs.sh     (revision 2829)
+--- common/func_validate_configs.sh     (revision 2861)
 +++ common/func_validate_configs.sh     (working copy)
-@@ -84,9 +84,9 @@
+@@ -86,10 +86,10 @@
  inline_doc
  
    # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
--  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
--  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
--  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
-+  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
-+  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
-+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
+-  local -r  hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
+-  local -r  clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
+-  local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE         ARCH  TARGET       OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
+-  local -r   lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
++  local -r  hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP         PAGE TIMEZONE LANG LC_ALL"
++  local -r  clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
++  local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE         ARCH  TARGET       OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"
++  local -r   lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL        VIMLANG PAGE TIMEZONE LANG"
  
    local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
-@@ -176,6 +176,7 @@
+@@ -179,6 +179,7 @@
                      [[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x"
                    fi ;;
@@ -431 +433 @@
 Index: common/common-functions
 ===================================================================
---- common/common-functions     (revision 2829)
+--- common/common-functions     (revision 2861)
 +++ common/common-functions     (working copy)
 @@ -69,6 +69,9 @@
@@ -443 +445 @@
          Optimize [0-2]
            0 = no optimization
-@@ -733,6 +736,7 @@
+@@ -759,6 +762,7 @@
                   --stringparam lc_all $LC_ALL \
                   --stringparam keymap $KEYMAP \
@@ -451 +453 @@
        ;;
      lfs)
-@@ -744,6 +748,7 @@
+@@ -770,6 +774,7 @@
                   --stringparam timezone $TIMEZONE \
                   --stringparam page $PAGE \
@@ -461 +463 @@
 Index: HLFS/hlfs.xsl
 ===================================================================
---- HLFS/hlfs.xsl       (revision 2829)
+--- HLFS/hlfs.xsl       (revision 2861)
 +++ HLFS/hlfs.xsl       (working copy)
 @@ -39,6 +39,9 @@
@@ -473 +475 @@
      <xsl:apply-templates select="//sect1"/>
    </xsl:template>
-@@ -191,6 +194,10 @@
+@@ -177,6 +180,10 @@
        <!-- Fixing bootscripts installation -->
        <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
@@ -484 +486 @@
          <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;&#xA;</xsl:text>
        </xsl:when>
-@@ -257,6 +264,25 @@
+@@ -237,6 +244,27 @@
          <xsl:apply-templates/>
          <xsl:text> || true&#xA;</xsl:text>
        </xsl:when>
++
 +      <!-- paco begin -->
 +      <!-- General rule -->
@@ -495 +498 @@
 +                contains(string(),'install')">
 +        <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so&#xA;</xsl:text>
-+        <xsl:apply-templates/>
++        <xsl:apply-templates/> 
 +        <xsl:text>&#xA;</xsl:text>
 +      </xsl:when>
 +      <!-- Linux-libc-headers -->
 +      <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
-+                ancestor::sect1[@id='ch-system-linux-libc-headers'] and
++                ancestor::sect1[@id='ch-system-linux-headers'] and
 +                contains(string(),'install ')">
 +        <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so&#xA;</xsl:text>
-+        <xsl:apply-templates/>
++        <xsl:apply-templates/> 
 +        <xsl:text>&#xA;</xsl:text>
 +      </xsl:when>
 +      <!-- paco end -->
++
        <!-- The rest of commands -->
        <xsl:otherwise>
@@ -512 +516 @@
 Index: HLFS/master.sh
 ===================================================================
---- HLFS/master.sh      (revision 2829)
+--- HLFS/master.sh      (revision 2861)
 +++ HLFS/master.sh      (working copy)
-@@ -250,6 +250,11 @@
+@@ -76,7 +76,9 @@
+        @echo "export PKGDIR=\$(SRC)" > envars
+ EOF
+ ) >> $MKFILE.tmp
++      wrt_paco_prep
+       wrt_run_as_chroot1 "$toolchain" "$this_script"
++      wrt_paco_log "`echo $toolchain | sed -e 's@[0-9]\{3\}-@@'`"
+       ;;
+ 
+     *)
+@@ -310,6 +312,11 @@
      # Keep the script file name
      this_script=`basename $file`
@@ -526 +540 @@
      case $this_script in
          # We'll run the chroot commands differently than the others, so skip them in the
-@@ -259,6 +264,18 @@
+@@ -319,6 +326,18 @@
        *-stripping* )  [[ "$STRIP" = "0" ]] && continue ;;
      esac
@@ -534 +548 @@
 +    if [[ -z "$N" ]]; then
 +      case $this_script in
-+        *linux-libc-headers)
++        *linux-headers)
 +          TMP_SCRIPT="$this_script"
-+          this_script=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'`
++          this_script=`echo $this_script | sed -e 's/linux-headers/a-paco/'`
 +          wrt_paco_inst "$this_script"
 +          this_script="$TMP_SCRIPT" ;;
@@ -545 +559 @@
      name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
  
-@@ -334,7 +351,9 @@
-         wrt_run_as_root "${this_script}" "${file}"
+@@ -385,7 +404,9 @@
+         wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
          ;;
        *)   # The rest of Chapter06
@@ -555 +569 @@
      esac
      #
-@@ -367,6 +386,16 @@
+@@ -405,6 +426,16 @@
      PREV=${this_script}${N}
      # Set system_build envar for iteration targets
@@ -572 +586 @@
  
  }
-@@ -426,9 +455,19 @@
+@@ -463,9 +494,19 @@
          else  # Initialize the log and run the script
            wrt_run_as_chroot2 "${this_script}" "${file}"
@@ -594 +608 @@
 Index: master.sh
 ===================================================================
---- master.sh   (revision 2829)
+--- master.sh   (revision 2861)
 +++ master.sh   (working copy)
 @@ -149,6 +149,8 @@
@@ -605 +619 @@
        test $# = 1 && eval "$exit_missing_arg"
        shift
-@@ -440,6 +442,14 @@
+@@ -444,6 +446,14 @@
    [[ $VERBOSITY > 0 ]] && echo "OK"
  fi
@@ -620 +634 @@
  if [[ "$OPTIMIZE" != "0" ]]; then
    [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..."
-@@ -486,6 +496,8 @@
+@@ -490,6 +500,8 @@
  if [[ "$PWD" != "$JHALFSDIR" ]]; then
    cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/