Changeset 9b09518 for contrib/jhalfs-paco.patch
- Timestamp:
- 07/30/2006 03:00:54 PM (18 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 8715be1
- Parents:
- b2489fb
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/jhalfs-paco.patch
rb2489fb r9b09518 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 28 29)3 --- LFS/master.sh (revision 2861) 4 4 +++ LFS/master.sh (working copy) 5 @@ -17 6,6 +176,11 @@5 @@ -173,6 +173,11 @@ 6 6 # Keep the script file name 7 7 this_script=`basename $file` … … 15 15 # dependencies and target creation. 16 16 case "${this_script}" in 17 @@ -18 3,6 +188,18 @@17 @@ -180,6 +185,18 @@ 18 18 *stripping*) [[ "${STRIP}" = "0" ]] && continue ;; 19 19 esac … … 34 34 name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'` 35 35 36 @@ -23 5,7 +252,9 @@36 @@ -232,7 +249,9 @@ 37 37 # and not to use chroot. 38 38 case "${this_script}" in … … 45 45 46 46 # Remove the build directory(ies) except if the package build fails. 47 @@ -25 5,6 +274,16 @@47 @@ -252,6 +271,16 @@ 48 48 PREV=${this_script}${N} 49 49 # Set system_build envar for iteration targets … … 62 62 } 63 63 64 @@ -31 5,8 +344,18 @@64 @@ -312,8 +341,18 @@ 65 65 else 66 66 wrt_run_as_chroot2 "$this_script" "$file" … … 83 83 Index: LFS/lfs.xsl 84 84 =================================================================== 85 --- LFS/lfs.xsl (revision 28 29)85 --- LFS/lfs.xsl (revision 2861) 86 86 +++ LFS/lfs.xsl (working copy) 87 87 @@ -32,6 +32,9 @@ … … 95 95 <xsl:apply-templates select="//sect1"/> 96 96 </xsl:template> 97 @@ -20 0,6 +203,33 @@97 @@ -206,6 +209,33 @@ 98 98 <xsl:apply-templates/> 99 99 <xsl:text> || true
</xsl:text> … … 148 148 Index: common/config 149 149 =================================================================== 150 --- common/config (revision 28 29)150 --- common/config (revision 2861) 151 151 +++ common/config (working copy) 152 152 @@ -86,6 +86,14 @@ … … 157 157 +#--- Use paco? 0(no)/1(yes) 158 158 +USE_PACO=1 159 +PACO_VERSION=1.10. 8159 +PACO_VERSION=1.10.10 160 160 + 161 161 +#--- Name of the Paco source package … … 177 177 Index: common/func_validate_configs.sh 178 178 =================================================================== 179 --- common/func_validate_configs.sh (revision 28 29)179 --- common/func_validate_configs.sh (revision 2861) 180 180 +++ common/func_validate_configs.sh (working copy) 181 @@ -8 4,9 +84,9@@181 @@ -86,10 +86,10 @@ 182 182 inline_doc 183 183 184 184 # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables 185 - 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" 186 - 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" 187 - 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" 188 + 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" 189 + 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" 190 + 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" 185 - 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" 186 - 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" 187 - 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" 188 - 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" 189 + 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" 190 + 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" 191 + 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" 192 + 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" 191 193 192 194 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,' 193 195 local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}' 194 @@ -17 6,6 +176,7 @@196 @@ -179,6 +179,7 @@ 195 197 [[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x" 196 198 fi ;; … … 431 433 Index: common/common-functions 432 434 =================================================================== 433 --- common/common-functions (revision 28 29)435 --- common/common-functions (revision 2861) 434 436 +++ common/common-functions (working copy) 435 437 @@ -69,6 +69,9 @@ … … 443 445 Optimize [0-2] 444 446 0 = no optimization 445 @@ -7 33,6 +736,7 @@447 @@ -759,6 +762,7 @@ 446 448 --stringparam lc_all $LC_ALL \ 447 449 --stringparam keymap $KEYMAP \ … … 451 453 ;; 452 454 lfs) 453 @@ -7 44,6 +748,7 @@455 @@ -770,6 +774,7 @@ 454 456 --stringparam timezone $TIMEZONE \ 455 457 --stringparam page $PAGE \ … … 461 463 Index: HLFS/hlfs.xsl 462 464 =================================================================== 463 --- HLFS/hlfs.xsl (revision 28 29)465 --- HLFS/hlfs.xsl (revision 2861) 464 466 +++ HLFS/hlfs.xsl (working copy) 465 467 @@ -39,6 +39,9 @@ … … 473 475 <xsl:apply-templates select="//sect1"/> 474 476 </xsl:template> 475 @@ -1 91,6 +194,10 @@477 @@ -177,6 +180,10 @@ 476 478 <!-- Fixing bootscripts installation --> 477 479 <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and … … 484 486 <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;
</xsl:text> 485 487 </xsl:when> 486 @@ -2 57,6 +264,25@@488 @@ -237,6 +244,27 @@ 487 489 <xsl:apply-templates/> 488 490 <xsl:text> || true
</xsl:text> 489 491 </xsl:when> 492 + 490 493 + <!-- paco begin --> 491 494 + <!-- General rule --> … … 495 498 + contains(string(),'install')"> 496 499 + <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so
</xsl:text> 497 + <xsl:apply-templates/> 500 + <xsl:apply-templates/> 498 501 + <xsl:text>
</xsl:text> 499 502 + </xsl:when> 500 503 + <!-- Linux-libc-headers --> 501 504 + <xsl:when test="$use_paco != '0' and $model != 'uclibc' and 502 + ancestor::sect1[@id='ch-system-linux- libc-headers'] and505 + ancestor::sect1[@id='ch-system-linux-headers'] and 503 506 + contains(string(),'install ')"> 504 507 + <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so
</xsl:text> 505 + <xsl:apply-templates/> 508 + <xsl:apply-templates/> 506 509 + <xsl:text>
</xsl:text> 507 510 + </xsl:when> 508 511 + <!-- paco end --> 512 + 509 513 <!-- The rest of commands --> 510 514 <xsl:otherwise> … … 512 516 Index: HLFS/master.sh 513 517 =================================================================== 514 --- HLFS/master.sh (revision 28 29)518 --- HLFS/master.sh (revision 2861) 515 519 +++ HLFS/master.sh (working copy) 516 @@ -250,6 +250,11 @@ 520 @@ -76,7 +76,9 @@ 521 @echo "export PKGDIR=\$(SRC)" > envars 522 EOF 523 ) >> $MKFILE.tmp 524 + wrt_paco_prep 525 wrt_run_as_chroot1 "$toolchain" "$this_script" 526 + wrt_paco_log "`echo $toolchain | sed -e 's@[0-9]\{3\}-@@'`" 527 ;; 528 529 *) 530 @@ -310,6 +312,11 @@ 517 531 # Keep the script file name 518 532 this_script=`basename $file` … … 526 540 case $this_script in 527 541 # We'll run the chroot commands differently than the others, so skip them in the 528 @@ - 259,6 +264,18 @@542 @@ -319,6 +326,18 @@ 529 543 *-stripping* ) [[ "$STRIP" = "0" ]] && continue ;; 530 544 esac … … 534 548 + if [[ -z "$N" ]]; then 535 549 + case $this_script in 536 + *linux- libc-headers)550 + *linux-headers) 537 551 + TMP_SCRIPT="$this_script" 538 + this_script=`echo $this_script | sed -e 's/linux- libc-headers/a-paco/'`552 + this_script=`echo $this_script | sed -e 's/linux-headers/a-paco/'` 539 553 + wrt_paco_inst "$this_script" 540 554 + this_script="$TMP_SCRIPT" ;; … … 545 559 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` 546 560 547 @@ -3 34,7 +351,9 @@548 wrt_ run_as_root"${this_script}" "${file}"561 @@ -385,7 +404,9 @@ 562 wrt_RunAsRoot "hlfs" "${this_script}" "${file}" 549 563 ;; 550 564 *) # The rest of Chapter06 … … 555 569 esac 556 570 # 557 @@ - 367,6 +386,16 @@571 @@ -405,6 +426,16 @@ 558 572 PREV=${this_script}${N} 559 573 # Set system_build envar for iteration targets … … 572 586 573 587 } 574 @@ -4 26,9 +455,19 @@588 @@ -463,9 +494,19 @@ 575 589 else # Initialize the log and run the script 576 590 wrt_run_as_chroot2 "${this_script}" "${file}" … … 594 608 Index: master.sh 595 609 =================================================================== 596 --- master.sh (revision 28 29)610 --- master.sh (revision 2861) 597 611 +++ master.sh (working copy) 598 612 @@ -149,6 +149,8 @@ … … 605 619 test $# = 1 && eval "$exit_missing_arg" 606 620 shift 607 @@ -44 0,6 +442,14 @@621 @@ -444,6 +446,14 @@ 608 622 [[ $VERBOSITY > 0 ]] && echo "OK" 609 623 fi … … 620 634 if [[ "$OPTIMIZE" != "0" ]]; then 621 635 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..." 622 @@ -4 86,6 +496,8 @@636 @@ -490,6 +500,8 @@ 623 637 if [[ "$PWD" != "$JHALFSDIR" ]]; then 624 638 cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
Note:
See TracChangeset
for help on using the changeset viewer.