From daa9b6c5e76c151f008d14039478b0ed585daebc Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Tue, 8 Aug 2006 17:52:49 +0000 Subject: [PATCH] Rediffied paco patch. --- contrib/jhalfs-paco.patch | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/contrib/jhalfs-paco.patch b/contrib/jhalfs-paco.patch index c99349d..cbfb11b 100644 --- a/contrib/jhalfs-paco.patch +++ b/contrib/jhalfs-paco.patch @@ -1,6 +1,6 @@ Index: LFS/master.sh =================================================================== ---- LFS/master.sh (revision 2884) +--- LFS/master.sh (revision 2905) +++ LFS/master.sh (working copy) @@ -173,6 +173,11 @@ # Keep the script file name @@ -36,7 +36,7 @@ Index: LFS/master.sh @@ -232,7 +249,9 @@ # and not to use chroot. case "${this_script}" in - *kernfs) wrt_run_as_root "${this_script}" "$file" ;; + *kernfs) wrt_RunAsRoot "${this_script}" "$file" ;; - *) wrt_run_as_chroot1 "${this_script}" "$file" ;; + *) wrt_paco_prep + wrt_run_as_chroot1 "${this_script}" "$file" @@ -79,7 +79,7 @@ Index: LFS/master.sh Index: LFS/lfs.xsl =================================================================== ---- LFS/lfs.xsl (revision 2884) +--- LFS/lfs.xsl (revision 2905) +++ LFS/lfs.xsl (working copy) @@ -39,6 +39,9 @@ @@ -127,7 +127,7 @@ Index: LFS/lfs.xsl Index: CLFS/master.sh =================================================================== ---- CLFS/master.sh (revision 2884) +--- CLFS/master.sh (revision 2905) +++ CLFS/master.sh (working copy) @@ -495,6 +495,11 @@ # Keep the script file name @@ -313,7 +313,7 @@ Index: CLFS/master.sh # Housekeeping...remove any build directory(ies) except if the package build fails. Index: CLFS/clfs.xsl =================================================================== ---- CLFS/clfs.xsl (revision 2884) +--- CLFS/clfs.xsl (revision 2905) +++ CLFS/clfs.xsl (working copy) @@ -45,6 +45,9 @@ @@ -370,7 +370,7 @@ Index: common/paco-build-hlfs.sh +make logme Index: common/config =================================================================== ---- common/config (revision 2884) +--- common/config (revision 2905) +++ common/config (working copy) @@ -91,6 +91,23 @@ #--- Run farce testing 0(no)/1(yes) @@ -408,20 +408,20 @@ Index: common/config +LD_PRELOAD=/usr/lib/libpaco-log.so Index: common/func_validate_configs.sh =================================================================== ---- common/func_validate_configs.sh (revision 2884) +--- common/func_validate_configs.sh (revision 2905) +++ common/func_validate_configs.sh (working copy) @@ -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 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 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 LUSER LGROUP" +- 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 LUSER LGROUP" +- local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP" +- 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 LUSER LGROUP" ++ 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 LUSER LGROUP" ++ 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 LUSER LGROUP" ++ local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG LUSER LGROUP" ++ 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 LUSER LGROUP" 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}' @@ -781,7 +781,7 @@ Index: common/paco-build-clfs.sh +make logme Index: common/common-functions =================================================================== ---- common/common-functions (revision 2884) +--- common/common-functions (revision 2905) +++ common/common-functions (working copy) @@ -69,6 +69,9 @@ in the configuration file has the proper packages and patches for the @@ -793,7 +793,7 @@ Index: common/common-functions ${BOLD} -O, --optimize${OFF} Optimize [0-2] 0 = no optimization -@@ -733,6 +736,7 @@ +@@ -696,6 +699,7 @@ --stringparam page $PAGE \ --stringparam lang $LANG \ --stringparam keymap $KEYMAP \ @@ -801,7 +801,7 @@ Index: common/common-functions -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 ;; -@@ -762,6 +766,7 @@ +@@ -723,6 +727,7 @@ --stringparam lc_all $LC_ALL \ --stringparam keymap $KEYMAP \ --stringparam grsecurity_host $GRSECURITY_HOST \ @@ -809,7 +809,7 @@ Index: common/common-functions -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 ;; lfs) -@@ -774,6 +779,7 @@ +@@ -735,6 +740,7 @@ --stringparam timezone $TIMEZONE \ --stringparam page $PAGE \ --stringparam lang $LANG \ @@ -817,7 +817,7 @@ Index: common/common-functions -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 ;; *) exit 1 ;; -@@ -840,6 +846,9 @@ +@@ -801,6 +807,9 @@ # Generate URLs file create_urls @@ -829,7 +829,7 @@ Index: common/common-functions IFS=$saveIFS # Restore the system defaults Index: HLFS/hlfs.xsl =================================================================== ---- HLFS/hlfs.xsl (revision 2884) +--- HLFS/hlfs.xsl (revision 2905) +++ HLFS/hlfs.xsl (working copy) @@ -46,6 +46,9 @@ @@ -880,9 +880,9 @@ Index: HLFS/hlfs.xsl Index: HLFS/master.sh =================================================================== ---- HLFS/master.sh (revision 2884) +--- HLFS/master.sh (revision 2905) +++ HLFS/master.sh (working copy) -@@ -92,7 +92,9 @@ +@@ -40,7 +40,9 @@ EOF ) >> $MKFILE.tmp [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" @@ -892,7 +892,7 @@ Index: HLFS/master.sh ;; *) -@@ -324,6 +326,11 @@ +@@ -272,6 +274,11 @@ # Keep the script file name this_script=`basename $file` @@ -904,7 +904,7 @@ Index: HLFS/master.sh # Skip this script depending on jhalfs.conf flags set. case $this_script in # We'll run the chroot commands differently than the others, so skip them in the -@@ -333,6 +340,18 @@ +@@ -281,6 +288,18 @@ *-stripping* ) [[ "$STRIP" = "0" ]] && continue ;; esac @@ -923,8 +923,8 @@ Index: HLFS/master.sh # Grab the name of the target name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` -@@ -398,7 +417,9 @@ - wrt_RunAsRoot "hlfs" "${this_script}" "${file}" +@@ -346,7 +365,9 @@ + wrt_RunAsRoot "${this_script}" "${file}" ;; *) # The rest of Chapter06 + wrt_paco_prep @@ -933,7 +933,7 @@ Index: HLFS/master.sh ;; esac # -@@ -418,6 +439,16 @@ +@@ -366,6 +387,16 @@ PREV=${this_script}${N} # Set system_build envar for iteration targets system_build=$chapter6 @@ -950,7 +950,7 @@ Index: HLFS/master.sh done # end for file in chapter06/* } -@@ -476,9 +507,19 @@ +@@ -424,9 +455,19 @@ else # Initialize the log and run the script wrt_run_as_chroot2 "${this_script}" "${file}" fi @@ -972,7 +972,7 @@ Index: HLFS/master.sh Index: master.sh =================================================================== ---- master.sh (revision 2884) +--- master.sh (revision 2905) +++ master.sh (working copy) @@ -149,6 +149,8 @@