Changeset f3ae556
- Timestamp:
- 05/11/2006 08:36:50 PM (18 years ago)
- Branches:
- 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 5a13801
- Parents:
- 1b65a84
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/jhalfs-paco.patch
r1b65a84 rf3ae556 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 26 46)3 --- LFS/master.sh (revision 2677) 4 4 +++ LFS/master.sh (working copy) 5 @@ -1 79,6 +179,18 @@5 @@ -180,6 +180,18 @@ 6 6 *stripping*) [[ "${STRIP}" = "0" ]] && continue ;; 7 7 esac … … 22 22 name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'` 23 23 24 @@ -22 1,7 +233,9 @@24 @@ -223,7 +235,9 @@ 25 25 # and not to use chroot. 26 26 case "${this_script}" in … … 33 33 34 34 # Remove the build directory(ies) except if the package build fails. 35 @@ -24 1,6 +255,16 @@35 @@ -243,6 +257,16 @@ 36 36 PREV=${this_script}${N} 37 37 # Set system_build envar for iteration targets … … 50 50 } 51 51 52 @@ -30 2,6 +326,14 @@52 @@ -304,6 +328,14 @@ 53 53 wrt_run_as_chroot2 "$this_script" "$file" 54 54 fi … … 67 67 Index: LFS/lfs.xsl 68 68 =================================================================== 69 --- LFS/lfs.xsl (revision 26 46)69 --- LFS/lfs.xsl (revision 2677) 70 70 +++ LFS/lfs.xsl (working copy) 71 71 @@ -32,6 +32,9 @@ … … 115 115 Index: BLFS/master.sh 116 116 =================================================================== 117 --- BLFS/master.sh (revision 26 46)117 --- BLFS/master.sh (revision 2677) 118 118 +++ BLFS/master.sh (working copy) 119 119 @@ -79,6 +79,19 @@ … … 147 147 Index: BLFS/blfs.xsl 148 148 =================================================================== 149 --- BLFS/blfs.xsl (revision 26 46)149 --- BLFS/blfs.xsl (revision 2677) 150 150 +++ BLFS/blfs.xsl (working copy) 151 151 @@ -159,7 +159,7 @@ … … 176 176 Index: common/config 177 177 =================================================================== 178 --- common/config (revision 26 46)178 --- common/config (revision 2677) 179 179 +++ common/config (working copy) 180 @@ -8 0,6 +80,14 @@180 @@ -88,6 +88,14 @@ 181 181 #--- Run farce testing 0(no)/1(yes) 182 182 RUN_FARCE=0 … … 193 193 # Don't edit it unless you know what you are doing 194 194 195 @@ - 92,3 +100,9 @@195 @@ -100,3 +108,9 @@ 196 196 197 197 #--- farce report log directory … … 205 205 Index: common/func_validate_configs.sh 206 206 =================================================================== 207 --- common/func_validate_configs.sh (revision 26 46)207 --- common/func_validate_configs.sh (revision 2677) 208 208 +++ common/func_validate_configs.sh (working copy) 209 209 @@ -84,10 +84,10 @@ … … 211 211 212 212 # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables 213 - local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG DEPEND TEST "214 - local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL"215 - local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"216 - local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG"217 + local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG DEPEND TEST "218 + local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL"219 + local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"220 + local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG"213 - local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG DEPEND TEST OPTIMIZE" 214 - 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" 215 - 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" 216 - 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" 217 + local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG DEPEND TEST OPTIMIZE" 218 + 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" 219 + 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" 220 + 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" 221 221 222 222 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,' … … 363 363 Index: common/common-functions 364 364 =================================================================== 365 --- common/common-functions (revision 26 46)365 --- common/common-functions (revision 2677) 366 366 +++ common/common-functions (working copy) 367 367 @@ -65,6 +65,9 @@ … … 372 372 + dissables paco logging feature. 373 373 + 374 ${BOLD} - T, --testsuites N${OFF}375 Run test suites [0-3]376 0 = no ne377 @@ -5 75,6 +578,7 @@374 ${BOLD} -O, --optimize${OFF} 375 Optimize [0-2] 376 0 = no optimization 377 @@ -581,6 +584,7 @@ 378 378 --stringparam lc_all $LC_ALL \ 379 379 --stringparam keymap $KEYMAP \ … … 383 383 ;; 384 384 lfs) 385 @@ -5 86,6 +590,7 @@385 @@ -592,6 +596,7 @@ 386 386 --stringparam timezone $TIMEZONE \ 387 387 --stringparam page $PAGE \ … … 393 393 Index: HLFS/hlfs.xsl 394 394 =================================================================== 395 --- HLFS/hlfs.xsl (revision 26 46)395 --- HLFS/hlfs.xsl (revision 2677) 396 396 +++ HLFS/hlfs.xsl (working copy) 397 397 @@ -39,6 +39,9 @@ … … 444 444 Index: HLFS/master.sh 445 445 =================================================================== 446 --- HLFS/master.sh (revision 26 46)446 --- HLFS/master.sh (revision 2677) 447 447 +++ HLFS/master.sh (working copy) 448 @@ -25 3,6 +253,18 @@448 @@ -254,6 +254,18 @@ 449 449 *-stripping* ) [[ "$STRIP" = "0" ]] && continue ;; 450 450 esac … … 465 465 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` 466 466 467 @@ -32 2,7 +334,9 @@467 @@ -324,7 +336,9 @@ 468 468 wrt_run_as_root "${this_script}" "${file}" 469 469 ;; … … 475 475 esac 476 476 # 477 @@ -35 5,6 +369,16 @@477 @@ -357,6 +371,16 @@ 478 478 PREV=${this_script}${N} 479 479 # Set system_build envar for iteration targets … … 492 492 493 493 } 494 @@ -41 7,6 +441,15 @@494 @@ -419,6 +443,15 @@ 495 495 wrt_run_as_chroot2 "${this_script}" "${file}" 496 496 fi … … 510 510 Index: master.sh 511 511 =================================================================== 512 --- master.sh (revision 26 46)512 --- master.sh (revision 2677) 513 513 +++ master.sh (working copy) 514 514 @@ -147,6 +147,8 @@ … … 518 518 + --no-paco ) USE_PACO=0 ;; 519 519 + 520 -- testsuites | -T)520 --optimize | -O ) 521 521 test $# = 1 && eval "$exit_missing_arg" 522 522 shift 523 @@ -448,6 +450,15 @@ 524 [[ $? > 0 ]] && echo "$COMMON_DIR/func_compare.sh did not load.." && exit 523 @@ -464,6 +466,14 @@ 525 524 [[ $VERBOSITY > 0 ]] && echo "OK" 526 525 fi 527 +#526 # 528 527 +# paco module 529 528 +if [[ "$USE_PACO" = "1" ]]; then … … 534 533 +fi 535 534 +# 536 537 # Prevents setting "-d /" by mistake.538 539 @@ - 472,6 +483,15 @@535 # optimize module 536 if [[ "$OPTIMIZE" != "0" ]]; then 537 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..." 538 @@ -507,6 +517,15 @@ 540 539 541 540 if [[ "$PWD" != "$JHALFSDIR" ]]; then … … 550 549 + fi 551 550 + fi 551 [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/ 552 552 if [[ "$COMPARE" != "0" ]] ; then 553 553 mkdir -p $JHALFSDIR/extras 554 cp extras/* $JHALFSDIR/extras
Note:
See TracChangeset
for help on using the changeset viewer.