Changeset 963fdae

Timestamp:

08/05/2006 03:56:24 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:

cfaeeb4

Parents:

28f4756

Message:

Rediffied paco patch.

File:

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

contrib/jhalfs-paco.patch

@@ -1 +1 @@
 Index: LFS/master.sh
 ===================================================================
---- LFS/master.sh       (revision 2873)
+--- LFS/master.sh       (revision 2884)
 +++ LFS/master.sh       (working copy)
 @@ -173,6 +173,11 @@
@@ -80 +80 @@
 Index: LFS/lfs.xsl
 ===================================================================
---- LFS/lfs.xsl (revision 2873)
+--- LFS/lfs.xsl (revision 2884)
 +++ LFS/lfs.xsl (working copy)
-@@ -32,6 +32,9 @@
+@@ -39,6 +39,9 @@
    <!-- Locale settings -->
    <xsl:param name="lang" select="C"/>
@@ -92 +92 @@
      <xsl:apply-templates select="//sect1"/>
    </xsl:template>
-@@ -206,6 +209,33 @@
+@@ -239,6 +242,33 @@
          <xsl:apply-templates/>
          <xsl:text> || true&#xA;</xsl:text>
@@ -128 +128 @@
 Index: CLFS/master.sh
 ===================================================================
---- CLFS/master.sh      (revision 2873)
+--- CLFS/master.sh      (revision 2884)
 +++ CLFS/master.sh      (working copy)
 @@ -495,6 +495,11 @@
@@ -314 +314 @@
 Index: CLFS/clfs.xsl
 ===================================================================
---- CLFS/clfs.xsl       (revision 2873)
+--- CLFS/clfs.xsl       (revision 2884)
 +++ CLFS/clfs.xsl       (working copy)
-@@ -38,6 +38,9 @@
+@@ -45,6 +45,9 @@
    <!-- Locale settings -->
    <xsl:param name="lang" select="C"/>
@@ -326 +326 @@
      <xsl:apply-templates select="//sect1"/>
    </xsl:template>
-@@ -99,6 +102,25 @@
+@@ -106,6 +109,25 @@
                  <xsl:text>tar -xvf ../vim-&vim-version;-lang.* --strip-components=1&#xA;</xsl:text>
                </xsl:if>
@@ -371 +371 @@
 Index: common/config
 ===================================================================
---- common/config       (revision 2873)
+--- common/config       (revision 2884)
 +++ common/config       (working copy)
-@@ -86,6 +86,23 @@
+@@ -91,6 +91,23 @@
  #--- Run farce testing 0(no)/1(yes)
  RUN_FARCE=0
@@ -397 +397 @@
  # Don't edit it unless you know what you are doing
  
-@@ -103,3 +120,9 @@
+@@ -108,3 +125,9 @@
  
  #--- farce report log directory
@@ -409 +409 @@
 Index: common/func_validate_configs.sh
 ===================================================================
---- common/func_validate_configs.sh     (revision 2873)
+--- common/func_validate_configs.sh     (revision 2884)
 +++ common/func_validate_configs.sh     (working copy)
 @@ -86,10 +86,10 @@
@@ -415 +415 @@
  
    # 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 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  hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_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 BOMB_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 BOMB_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 BOMB_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 BOMB_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 BOMB_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,'
@@ -782 +782 @@
 Index: common/common-functions
 ===================================================================
---- common/common-functions     (revision 2873)
+--- common/common-functions     (revision 2884)
 +++ common/common-functions     (working copy)
 @@ -69,6 +69,9 @@
@@ -794 +794 @@
          Optimize [0-2]
            0 = no optimization
-@@ -732,6 +735,7 @@
+@@ -733,6 +736,7 @@
                   --stringparam page $PAGE \
                   --stringparam lang $LANG \
@@ -802 +802 @@
        ;;
  
-@@ -759,6 +763,7 @@
+@@ -762,6 +766,7 @@
                   --stringparam lc_all $LC_ALL \
                   --stringparam keymap $KEYMAP \
@@ -810 +810 @@
        ;;
      lfs)
-@@ -770,6 +775,7 @@
+@@ -774,6 +779,7 @@
                   --stringparam timezone $TIMEZONE \
                   --stringparam page $PAGE \
@@ -818 +818 @@
        ;;
      *) exit 1 ;;
-@@ -836,6 +842,9 @@
+@@ -840,6 +846,9 @@
      # Generate URLs file
    create_urls
@@ -830 +830 @@
 Index: HLFS/hlfs.xsl
 ===================================================================
---- HLFS/hlfs.xsl       (revision 2873)
+--- HLFS/hlfs.xsl       (revision 2884)
 +++ HLFS/hlfs.xsl       (working copy)
-@@ -39,6 +39,9 @@
+@@ -46,6 +46,9 @@
    <xsl:param name="lang" select="C"/>
    <xsl:param name="lc_all" select="C"/>
@@ -842 +842 @@
      <xsl:apply-templates select="//sect1"/>
    </xsl:template>
-@@ -177,6 +180,10 @@
+@@ -192,6 +195,10 @@
        <!-- Fixing bootscripts installation -->
        <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
@@ -853 +853 @@
          <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;&#xA;</xsl:text>
        </xsl:when>
-@@ -237,6 +244,25 @@
+@@ -280,6 +287,25 @@
          <xsl:apply-templates/>
          <xsl:text> || true&#xA;</xsl:text>
@@ -881 +881 @@
 Index: HLFS/master.sh
 ===================================================================
---- HLFS/master.sh      (revision 2873)
+--- HLFS/master.sh      (revision 2884)
 +++ HLFS/master.sh      (working copy)
-@@ -76,7 +76,9 @@
-        @echo "export PKGDIR=\$(SRC)" > envars
+@@ -92,7 +92,9 @@
  EOF
  ) >> $MKFILE.tmp
+       [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
 +      wrt_paco_prep
        wrt_run_as_chroot1 "$toolchain" "$this_script"
@@ -893 +893 @@
  
      *)
-@@ -308,6 +310,11 @@
+@@ -324,6 +326,11 @@
      # Keep the script file name
      this_script=`basename $file`
@@ -905 +905 @@
      case $this_script in
          # We'll run the chroot commands differently than the others, so skip them in the
-@@ -317,6 +324,18 @@
+@@ -333,6 +340,18 @@
        *-stripping* )  [[ "$STRIP" = "0" ]] && continue ;;
      esac
@@ -924 +924 @@
      name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
  
-@@ -382,7 +401,9 @@
+@@ -398,7 +417,9 @@
          wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
          ;;
@@ -934 +934 @@
      esac
      #
-@@ -402,6 +423,16 @@
+@@ -418,6 +439,16 @@
      PREV=${this_script}${N}
      # Set system_build envar for iteration targets
@@ -951 +951 @@
  
  }
-@@ -460,9 +491,19 @@
+@@ -476,9 +507,19 @@
          else  # Initialize the log and run the script
            wrt_run_as_chroot2 "${this_script}" "${file}"
@@ -973 +973 @@
 Index: master.sh
 ===================================================================
---- master.sh   (revision 2873)
+--- master.sh   (revision 2884)
 +++ master.sh   (working copy)
 @@ -149,6 +149,8 @@