Changeset 3ab7be7

Timestamp:

04/26/2006 08:36:26 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

249a487

Parents:

453bef0

Message:

Rediffied paco patch.

File:

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

contrib/jhalfs-paco.patch

@@ -1 +1 @@
 Index: LFS/master.sh
 ===================================================================
---- LFS/master.sh       (revision 2572)
+--- LFS/master.sh       (revision 2577)
 +++ LFS/master.sh       (working copy)
 @@ -158,6 +158,13 @@
@@ -60 +60 @@
 Index: LFS/lfs.xsl
 ===================================================================
---- LFS/lfs.xsl (revision 2572)
+--- LFS/lfs.xsl (revision 2577)
 +++ LFS/lfs.xsl (working copy)
 @@ -32,6 +32,9 @@
@@ -108 +108 @@
 Index: BLFS/master.sh
 ===================================================================
---- BLFS/master.sh      (revision 2572)
+--- BLFS/master.sh      (revision 2577)
 +++ BLFS/master.sh      (working copy)
 @@ -79,6 +79,19 @@
@@ -132 +132 @@
 Index: BLFS/blfs.xsl
 ===================================================================
---- BLFS/blfs.xsl       (revision 2572)
+--- BLFS/blfs.xsl       (revision 2577)
 +++ BLFS/blfs.xsl       (working copy)
 @@ -159,7 +159,7 @@
@@ -145 +145 @@
 Index: common/config
 ===================================================================
---- common/config       (revision 2572)
+--- common/config       (revision 2577)
 +++ common/config       (working copy)
-@@ -58,6 +58,23 @@
+@@ -62,6 +62,23 @@
  #    Not used in LFS
  KEYMAP=none
@@ -173 +173 @@
 Index: common/func_validate_configs.sh
 ===================================================================
---- common/func_validate_configs.sh     (revision 2572)
+--- common/func_validate_configs.sh     (revision 2577)
 +++ common/func_validate_configs.sh     (working copy)
 @@ -83,10 +83,10 @@
@@ -179 +179 @@
  
    # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
--  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG          DEPEND               TEST"
--  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
--  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
--  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
+-  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG         DEPEND                TEST"
+-  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
+-  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
+-  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST REPORT STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
 +  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG          DEPEND               TEST"
-+  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE MODEL GRSECURITY_HOST TEST STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
-+  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE METHOD  ARCH  TARGET  TEST STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
-+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE                       TEST STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
++  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
++  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
++  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE                       TEST REPORT STRIP FSTAB             CONFIG        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,'
@@ -331 +331 @@
 Index: common/common-functions
 ===================================================================
---- common/common-functions     (revision 2572)
+--- common/common-functions     (revision 2577)
 +++ common/common-functions     (working copy)
 @@ -60,6 +60,9 @@
@@ -343 +343 @@
          Run test suites  [0-3]
            0 = none
-@@ -604,6 +607,7 @@
+@@ -622,6 +625,7 @@
                   --stringparam lc_all $LC_ALL \
                   --stringparam keymap $KEYMAP \
@@ -351 +351 @@
        ;;
      lfs)
-@@ -615,6 +619,7 @@
+@@ -633,6 +637,7 @@
                   --stringparam timezone $TIMEZONE \
                   --stringparam page $PAGE \
@@ -361 +361 @@
 Index: HLFS/hlfs.xsl
 ===================================================================
---- HLFS/hlfs.xsl       (revision 2572)
+--- HLFS/hlfs.xsl       (revision 2577)
 +++ HLFS/hlfs.xsl       (working copy)
 @@ -39,6 +39,9 @@
@@ -412 +412 @@
 Index: HLFS/master.sh
 ===================================================================
---- HLFS/master.sh      (revision 2572)
+--- HLFS/master.sh      (revision 2577)
 +++ HLFS/master.sh      (working copy)
 @@ -318,6 +318,13 @@
@@ -471 +471 @@
 Index: master.sh
 ===================================================================
---- master.sh   (revision 2572)
+--- master.sh   (revision 2577)
 +++ master.sh   (working copy)
 @@ -66,6 +66,11 @@