From f358747c6a178c5e879e0454ec8fa37d2a7743a5 Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Sat, 27 May 2006 18:50:20 +0000 Subject: [PATCH] Updated paco patch. --- contrib/jhalfs-paco.patch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/jhalfs-paco.patch b/contrib/jhalfs-paco.patch index d2db3bc..d427b29 100644 --- a/contrib/jhalfs-paco.patch +++ b/contrib/jhalfs-paco.patch @@ -1,6 +1,6 @@ Index: LFS/master.sh =================================================================== ---- LFS/master.sh (revision 2702) +--- LFS/master.sh (revision 2727) +++ LFS/master.sh (working copy) @@ -173,6 +173,11 @@ # Keep the script file name @@ -78,7 +78,7 @@ Index: LFS/master.sh esac Index: LFS/lfs.xsl =================================================================== ---- LFS/lfs.xsl (revision 2702) +--- LFS/lfs.xsl (revision 2727) +++ LFS/lfs.xsl (working copy) @@ -32,6 +32,9 @@ @@ -142,7 +142,7 @@ Index: common/paco-build-hlfs.sh +make logme Index: common/config =================================================================== ---- common/config (revision 2702) +--- common/config (revision 2727) +++ common/config (working copy) @@ -84,6 +84,14 @@ #--- Run farce testing 0(no)/1(yes) @@ -171,24 +171,24 @@ Index: common/config +LD_PRELOAD=/usr/lib/libpaco-log.so Index: common/func_validate_configs.sh =================================================================== ---- common/func_validate_configs.sh (revision 2702) +--- common/func_validate_configs.sh (revision 2727) +++ common/func_validate_configs.sh (working copy) @@ -84,9 +84,9 @@ 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 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 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 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 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 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 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 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 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 \${OFF}' -@@ -173,6 +173,7 @@ - # Validate general parameters.. - GETPKG) validate_against_str "x0x x1x" ;; +@@ -176,6 +176,7 @@ + [[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x" + fi ;; RUNMAKE) validate_against_str "x0x x1x" ;; + USE_PACO) validate_against_str "x0x x1x" ;; REPORT) validate_against_str "x0x x1x" @@ -320,7 +320,7 @@ Index: common/paco-build-lfs.sh +make logme Index: common/common-functions =================================================================== ---- common/common-functions (revision 2702) +--- common/common-functions (revision 2727) +++ common/common-functions (working copy) @@ -65,6 +65,9 @@ in the configuration file has the proper packages and patches for the @@ -350,7 +350,7 @@ Index: common/common-functions *) exit 1 ;; Index: HLFS/hlfs.xsl =================================================================== ---- HLFS/hlfs.xsl (revision 2702) +--- HLFS/hlfs.xsl (revision 2727) +++ HLFS/hlfs.xsl (working copy) @@ -39,6 +39,9 @@ @@ -401,7 +401,7 @@ Index: HLFS/hlfs.xsl Index: HLFS/master.sh =================================================================== ---- HLFS/master.sh (revision 2702) +--- HLFS/master.sh (revision 2727) +++ HLFS/master.sh (working copy) @@ -245,6 +245,11 @@ # Keep the script file name @@ -479,7 +479,7 @@ Index: HLFS/master.sh ;; Index: master.sh =================================================================== ---- master.sh (revision 2702) +--- master.sh (revision 2727) +++ master.sh (working copy) @@ -147,6 +147,8 @@