Changeset 7bf2fdd
- Timestamp:
- 08/18/2006 06:40:45 PM (18 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- f4ed135
- Parents:
- 8e3ccf7
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/jhalfs-paco.patch
r8e3ccf7 r7bf2fdd 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 2916)3 --- LFS/master.sh (revision 3007) 4 4 +++ LFS/master.sh (working copy) 5 @@ -17 3,6 +173,11 @@5 @@ -172,6 +172,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 @@ -1 80,6 +185,18 @@18 *stripping*) [[ "${STRIP}" = " 0" ]] && continue ;;17 @@ -179,6 +184,18 @@ 18 *stripping*) [[ "${STRIP}" = "n" ]] && continue ;; 19 19 esac 20 20 … … 34 34 name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'` 35 35 36 @@ -23 2,7 +249,9 @@36 @@ -231,7 +248,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 2,6 +271,16 @@47 @@ -251,6 +270,16 @@ 48 48 PREV=${this_script}${N} 49 49 # Set system_build envar for iteration targets … … 62 62 } 63 63 64 @@ -31 2,8 +341,15 @@64 @@ -311,8 +340,15 @@ 65 65 else 66 66 wrt_run_as_chroot2 "$this_script" "$file" … … 80 80 Index: LFS/lfs.xsl 81 81 =================================================================== 82 --- LFS/lfs.xsl (revision 2916)82 --- LFS/lfs.xsl (revision 3007) 83 83 +++ LFS/lfs.xsl (working copy) 84 84 @@ -39,6 +39,9 @@ … … 87 87 88 88 + <!-- Use paco? --> 89 + <xsl:param name="use_paco" select=" 1"/>89 + <xsl:param name="use_paco" select="y"/> 90 90 + 91 91 <xsl:template match="/"> 92 92 <xsl:apply-templates select="//sect1"/> 93 93 </xsl:template> 94 @@ -2 39,6 +242,33 @@94 @@ -251,6 +254,33 @@ 95 95 <xsl:apply-templates/> 96 96 <xsl:text> || true
</xsl:text> … … 98 98 + <!-- paco begin --> 99 99 + <!-- General rule --> 100 + <xsl:when test="$use_paco != ' 0' and100 + <xsl:when test="$use_paco != 'n' and 101 101 + ancestor::chapter[@id != 'chapter-temporary-tools'] and 102 102 + contains(string(),'make') and … … 107 107 + </xsl:when> 108 108 + <!-- Linux-libc-headers --> 109 + <xsl:when test="$use_paco != ' 0' and109 + <xsl:when test="$use_paco != 'n' and 110 110 + ancestor::sect1[@id='ch-system-linux-libc-headers'] and 111 111 + contains(string(),'install ')"> … … 115 115 + </xsl:when> 116 116 + <!-- Unset LD_PRELOAD before second make in Zlib --> 117 + <xsl:when test="$use_paco != ' 0' and117 + <xsl:when test="$use_paco != 'n' and 118 118 + ancestor::sect1[@id='ch-system-zlib'] and 119 119 + contains(string(),'make clean')"> … … 128 128 Index: CLFS/master.sh 129 129 =================================================================== 130 --- CLFS/master.sh (revision 2916)130 --- CLFS/master.sh (revision 3007) 131 131 +++ CLFS/master.sh (working copy) 132 @@ -49 5,6 +495,11 @@132 @@ -494,6 +494,11 @@ 133 133 # Keep the script file name 134 134 this_script=`basename $file` … … 142 142 # Skip alsp temp-perl for iterative runs 143 143 case $this_script in 144 @@ -50 2,6 +507,18 @@144 @@ -501,6 +506,18 @@ 145 145 *temp-perl*) [[ -n "$N" ]] && continue ;; 146 146 esac … … 161 161 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' \ 162 162 -e 's@temp-@@' \ 163 @@ -55 4,7 +571,9 @@163 @@ -553,7 +570,9 @@ 164 164 [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 165 165 fi … … 171 171 [[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}" 172 172 # 173 @@ -56 9,6 +588,16 @@173 @@ -568,6 +587,16 @@ 174 174 PREV=${this_script}${N} 175 175 # Set system_build envar for iteration targets … … 188 188 } 189 189 190 @@ -60 5,6 +634,11 @@190 @@ -604,6 +633,11 @@ 191 191 # Keep the script file name 192 192 this_script=`basename $file` … … 200 200 # Skip alsp temp-perl for iterative runs 201 201 case $this_script in 202 @@ -61 2,6 +646,18 @@202 @@ -611,6 +645,18 @@ 203 203 *temp-perl*) [[ -n "$N" ]] && continue ;; 204 204 esac … … 219 219 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' \ 220 220 -e 's@temp-@@' \ 221 @@ -66 6,7 +712,9 @@221 @@ -665,7 +711,9 @@ 222 222 [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 223 223 fi … … 229 229 [[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs2 "${name}" 230 230 # 231 @@ -68 1,6 +729,16 @@231 @@ -680,6 +728,16 @@ 232 232 PREV=${this_script}${N} 233 233 # Set system_build envar for iteration targets … … 246 246 } 247 247 248 @@ -72 9,7 +787,17 @@248 @@ -728,7 +786,17 @@ 249 249 # 250 250 [[ "$pkg_tarball" != "" ]] && wrt_unpack2 "$pkg_tarball" … … 264 264 [[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs "${name}" 265 265 # 266 @@ -79 1,7 +859,17 @@266 @@ -790,7 +858,17 @@ 267 267 # 268 268 [[ "$pkg_tarball" != "" ]] && wrt_unpack3 "$pkg_tarball" … … 282 282 [[ "$pkg_tarball" != "" ]] && wrt_remove_build_dirs2 "${name}" 283 283 # 284 @@ -86 3,8 +941,13 @@284 @@ -862,8 +940,13 @@ 285 285 else 286 286 wrt_run_as_chroot1 "${this_script}" "${file}" … … 297 297 # 298 298 # Housekeeping...remove any build directory(ies) except if the package build fails. 299 @@ -94 2,8 +1025,13 @@299 @@ -941,8 +1024,13 @@ 300 300 else 301 301 wrt_run_as_root2 "${this_script}" "${file}" … … 314 314 Index: CLFS/clfs.xsl 315 315 =================================================================== 316 --- CLFS/clfs.xsl (revision 2916)316 --- CLFS/clfs.xsl (revision 3007) 317 317 +++ CLFS/clfs.xsl (working copy) 318 318 @@ -45,6 +45,9 @@ … … 321 321 322 322 + <!-- Use paco? --> 323 + <xsl:param name="use_paco" select=" 1"/>323 + <xsl:param name="use_paco" select="y"/> 324 324 + 325 325 <xsl:template match="/"> … … 332 332 + <!-- paco begin --> 333 333 + <!-- General rule --> 334 + <xsl:if test="$use_paco != ' 0' and334 + <xsl:if test="$use_paco != 'n' and 335 335 + @id='ch-scripts-bootscripts' or 336 336 + @id='ch-scripts-udev-rules' or … … 343 343 + </xsl:if> 344 344 + <!-- Linux headers --> 345 + <xsl:if test="$use_paco != ' 0' and345 + <xsl:if test="$use_paco != 'n' and 346 346 + @id='ch-system-linux-headers' and 347 347 + contains(string(),'install')"> … … 371 371 Index: common/config 372 372 =================================================================== 373 --- common/config (revision 2916)373 --- common/config (revision 3007) 374 374 +++ common/config (working copy) 375 375 @@ -91,6 +91,23 @@ 376 #--- Run farce testing 0(no)/1(yes)377 RUN_FARCE= 0376 #--- Run farce testing n(no)/y(yes) 377 RUN_FARCE=n 378 378 379 379 +#==== PACO VARIABLES ==== 380 +#--- Use paco? 0(no)/1(yes)381 +USE_PACO= 1380 +#--- Use paco? n(no)/y(yes) 381 +USE_PACO=y 382 382 +PACO_VERSION=1.10.10 383 383 + … … 409 409 Index: common/func_validate_configs.sh 410 410 =================================================================== 411 --- common/func_validate_configs.sh (revision 2916)411 --- common/func_validate_configs.sh (revision 3007) 412 412 +++ common/func_validate_configs.sh (working copy) 413 @@ -8 6,10 +86,10 @@413 @@ -88,10 +88,10 @@ 414 414 inline_doc 415 415 … … 417 417 - 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" 418 418 - 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" 419 - 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"420 - 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"421 419 + 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" 422 420 + 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" 423 + 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" 421 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" 422 - 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" 424 423 + 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" 424 local -r blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML" 425 425 426 426 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,' 427 local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}' 428 @@ -179,6 +179,7 @@ 429 [[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x" 427 @@ -182,6 +182,7 @@ 428 [[ "$GETPKG" = "y" ]] && validate_against_str "xnx xyx" 430 429 fi ;; 431 RUNMAKE) validate_against_str "x 0x x1x" ;;432 + USE_PACO) validate_against_str "x 0x x1x" ;;433 REPORT) validate_against_str "x 0x x1x"434 if [[ "${!config_param}" = " 1" ]]; then430 RUNMAKE) validate_against_str "xnx xyx" ;; 431 + USE_PACO) validate_against_str "xnx xyx" ;; 432 REPORT) validate_against_str "xnx xyx" 433 if [[ "${!config_param}" = "y" ]]; then 435 434 if [[ `type -p bc` ]]; then 436 435 Index: common/paco-functions … … 438 437 --- common/paco-functions (revision 0) 439 438 +++ common/paco-functions (revision 0) 440 @@ -0,0 +1,3 11@@439 @@ -0,0 +1,328 @@ 441 440 +#!/bin/bash 442 441 + … … 449 448 +check_build_model 450 449 + 451 +if [ $USE_PACO != 0]; then452 + case $PROGNAME in 450 +if [ $USE_PACO = "y" ]; then 451 + case $PROGNAME in 453 452 + clfs ) 454 453 + paco_file="final-system/$paco_script" … … 469 468 + wrt_run_as_root2 "${paco_script}" "${paco_file}" 470 469 + wrt_remove_build_dirs2 "paco" 471 + else 470 + else 472 471 + wrt_target "$paco_script" "$PREV" 473 472 + wrt_unpack2 "$PACO_FILE" … … 494 493 +check_log_package 495 494 + 496 +if [ $USE_PACO != 0] && [ $LOG_PACKAGE != 0 ]; then495 +if [ $USE_PACO = "y" ] && [ $LOG_PACKAGE != 0 ]; then 497 496 + if [ $CLFS_BOOT = 1 ]; then 498 497 + TMPFILEPATH="$PACO_TMPFILE" … … 526 525 + 527 526 + 528 +if [ $USE_PACO != 0]; then527 +if [ $USE_PACO = "y" ]; then 529 528 + if [ $LOG_PACKAGE != 0 ]; then 530 529 + # Only use this if doing CLFS boot build … … 576 575 +# These rules will add the missing files to the proper logs. 577 576 +# Most of these is not needed for HLFS, but they do no harm. 578 +if [ $USE_PACO != 0]; then577 +if [ $USE_PACO = "y" ]; then 579 578 + case $this_script in 579 + *e2fsprogs) 580 + fnc_add_log "echo /etc/mke2fs.conf" 581 + ;; 582 + *bootscripts) 583 + fnc_add_log "echo /etc/sysconfig/rc" 584 + fnc_add_log "echo /etc/sysconfig/createfiles" 585 + ;; 580 586 + *glibc) 581 587 + fnc_add_log "find /lib -type l" 582 + fnc_add_log " find/etc/{nsswitch.conf,ld.so.conf}"588 + fnc_add_log "echo /etc/{nsswitch.conf,ld.so.conf}" 583 589 + ;; 584 590 + *ncurses) 585 + fnc_add_log " find /usr/lib/{libcurses.so,libncurses.so,libform.so,libpanel.so,libmenu.so}"591 + fnc_add_log "echo /usr/lib/{libcurses.so,libncurses.so{,.5},libform.so,libpanel.so,libmenu.so}" 586 592 + ;; 587 593 + *bash) … … 593 599 + *shadow) 594 600 + fnc_add_log "echo /etc/login.defs" 601 + fnc_add_log "echo /etc/group" 595 602 + ;; 596 603 + *hotplug) … … 603 610 + *sysvinit) 604 611 + fnc_add_log "echo /etc/inittab" 612 + fnc_add_log "echo /usr/bin/lastb" 613 + ;; 614 + *texinfo) 615 + fnc_add_log "echo /usr/share/info/dir" 605 616 + ;; 606 617 + *udev) … … 608 619 + fnc_add_log "echo /lib/firmware" 609 620 + fnc_add_log "find /etc/udev/rules.d -type f" 621 + fnc_add_log "echo /etc/udev/udev.conf" 622 + ;; 623 + *udev-rules) 624 + fnc_add_log "echo /lib/udev/devices/{null,console}" 610 625 + ;; 611 626 + *util-linux) … … 643 658 + fnc_add_log "echo /etc/fstab" 644 659 + ;; 645 + *theend ) # LFS and CLFS660 + *theend | *finished) 646 661 + fnc_add_log "echo /etc/$PROGNAME-release" 647 + ;; 648 + *finished) # HLFS 649 + fnc_add_log "echo /etc/$PROGNAME-release" 662 + fnc_add_log "echo /var/run/utmp" 663 + fnc_add_log "echo /var/log/btmp" 664 + fnc_add_log "echo /var/log/wtmp" 665 + fnc_add_log "echo /var/log/lastlog" 650 666 + ;; 651 667 + esac … … 696 712 + 697 713 +# Test if paco is to be used 698 +[[ ! "$USE_PACO" = " 1" ]] && return714 +[[ ! "$USE_PACO" = "y" ]] && return 699 715 + 700 716 +# If the file exists in the archive copy it to the $BUILDDIR/sources dir. … … 739 755 + # Not using Paco with uClibc, even if requested 740 756 + if [ "$MODEL" = "uclibc" ]; then 741 + USE_PACO= 0757 + USE_PACO=n 742 758 + fi 743 759 + ;; … … 782 798 Index: common/common-functions 783 799 =================================================================== 784 --- common/common-functions (revision 2916)800 --- common/common-functions (revision 3007) 785 801 +++ common/common-functions (working copy) 786 802 @@ -69,6 +69,9 @@ … … 794 810 Optimize [0-2] 795 811 0 = no optimization 796 @@ - 696,6 +699,7 @@812 @@ -706,6 +709,7 @@ 797 813 --stringparam page $PAGE \ 798 814 --stringparam lang $LANG \ 799 --stringparam keymap $ {KEYMAP:-"none"}\815 --stringparam keymap $KEYMAP \ 800 816 + --stringparam use_paco $USE_PACO \ 801 817 -o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 802 818 ;; 803 819 804 @@ -7 23,6 +727,7 @@820 @@ -733,6 +737,7 @@ 805 821 --stringparam lc_all $LC_ALL \ 806 --stringparam keymap $ {KEYMAP:-"none"}\822 --stringparam keymap $KEYMAP \ 807 823 --stringparam grsecurity_host $GRSECURITY_HOST \ 808 824 + --stringparam use_paco $USE_PACO \ … … 810 826 ;; 811 827 lfs) 812 @@ -7 35,6 +740,7 @@828 @@ -745,6 +750,7 @@ 813 829 --stringparam timezone $TIMEZONE \ 814 830 --stringparam page $PAGE \ … … 818 834 ;; 819 835 *) exit 1 ;; 820 @@ -8 01,6 +807,9 @@836 @@ -811,6 +817,9 @@ 821 837 # Generate URLs file 822 838 create_urls … … 830 846 Index: HLFS/hlfs.xsl 831 847 =================================================================== 832 --- HLFS/hlfs.xsl (revision 2916)848 --- HLFS/hlfs.xsl (revision 3007) 833 849 +++ HLFS/hlfs.xsl (working copy) 834 850 @@ -46,6 +46,9 @@ … … 837 853 838 854 + <!-- Use paco? --> 839 + <xsl:param name="use_paco" select=" 1"/>855 + <xsl:param name="use_paco" select="y"/> 840 856 + 841 857 <xsl:template match="/"> 842 858 <xsl:apply-templates select="//sect1"/> 843 859 </xsl:template> 844 @@ -19 2,6 +195,10 @@860 @@ -196,6 +199,10 @@ 845 861 <!-- Fixing bootscripts installation --> 846 862 <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and 847 863 string() = 'make install'"> 848 864 + <!-- inserting LD_PRELOAD before installing bootscripts --> 849 + <xsl:if test="$use_paco != ' 0' and $model != 'uclibc'">865 + <xsl:if test="$use_paco != 'n' and $model != 'uclibc'"> 850 866 + <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so
</xsl:text> 851 867 + </xsl:if> … … 853 869 <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;
</xsl:text> 854 870 </xsl:when> 855 @@ -2 80,6 +287,25 @@871 @@ -296,6 +303,25 @@ 856 872 <xsl:apply-templates/> 857 873 <xsl:text> || true
</xsl:text> … … 859 875 + <!-- paco begin --> 860 876 + <!-- General rule --> 861 + <xsl:when test="$use_paco != ' 0' and $model != 'uclibc' and877 + <xsl:when test="$use_paco != 'n' and $model != 'uclibc' and 862 878 + ancestor::chapter[@id != 'chapter-temporary-tools'] and 863 879 + contains(string(),'make') and 864 880 + contains(string(),'install')"> 865 881 + <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so
</xsl:text> 866 + <xsl:apply-templates/> 882 + <xsl:apply-templates/> 867 883 + <xsl:text>
</xsl:text> 868 884 + </xsl:when> 869 885 + <!-- Linux-libc-headers --> 870 + <xsl:when test="$use_paco != ' 0' and $model != 'uclibc' and886 + <xsl:when test="$use_paco != 'n' and $model != 'uclibc' and 871 887 + ancestor::sect1[@id='ch-system-linux-headers'] and 872 888 + contains(string(),'install ')"> 873 889 + <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so
</xsl:text> 874 + <xsl:apply-templates/> 890 + <xsl:apply-templates/> 875 891 + <xsl:text>
</xsl:text> 876 892 + </xsl:when> … … 881 897 Index: HLFS/master.sh 882 898 =================================================================== 883 --- HLFS/master.sh (revision 2916)899 --- HLFS/master.sh (revision 3007) 884 900 +++ HLFS/master.sh (working copy) 885 @@ -4 0,7 +40,9 @@901 @@ -47,7 +47,9 @@ 886 902 EOF 887 903 ) >> $MKFILE.tmp … … 893 909 894 910 *) 895 @@ -2 72,6 +274,11 @@911 @@ -281,6 +283,11 @@ 896 912 # Keep the script file name 897 913 this_script=`basename $file` … … 905 921 case $this_script in 906 922 # We'll run the chroot commands differently than the others, so skip them in the 907 @@ -2 81,6 +288,18 @@908 *-stripping* ) [[ "$STRIP" = " 0" ]] && continue ;;923 @@ -290,6 +297,18 @@ 924 *-stripping* ) [[ "$STRIP" = "n" ]] && continue ;; 909 925 esac 910 926 … … 924 940 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` 925 941 926 @@ -3 46,7 +365,9 @@942 @@ -355,7 +374,9 @@ 927 943 wrt_RunAsRoot "${this_script}" "${file}" 928 944 ;; … … 934 950 esac 935 951 # 936 @@ -3 66,6 +387,16 @@952 @@ -375,6 +396,16 @@ 937 953 PREV=${this_script}${N} 938 954 # Set system_build envar for iteration targets … … 951 967 952 968 } 953 @@ -4 24,9 +455,19 @@969 @@ -433,9 +464,19 @@ 954 970 else # Initialize the log and run the script 955 971 wrt_run_as_chroot2 "${this_script}" "${file}" … … 973 989 Index: master.sh 974 990 =================================================================== 975 --- master.sh (revision 2916)991 --- master.sh (revision 3007) 976 992 +++ master.sh (working copy) 977 @@ -194,6 +194,8 @@ 993 @@ -71,6 +71,11 @@ 994 FARCELOGDIR=$LOGDIR/farce 995 XSL=$PROGNAME.xsl 996 PKG_LST=unpacked 997 + #--- PACO variables 998 + PACO_INCLUDE=/ 999 + PACO_EXCLUDE=/${SCRIPT_ROOT} 1000 + PACO_TMPFILE=/tmp/paco.tmp 1001 + LD_PRELOAD=/usr/lib/libpaco-log.so 1002 1003 case $PROGNAME in 1004 clfs2) LFSVRS=development; TREE=branches/clfs-2.0/BOOK ;; 1005 @@ -122,6 +127,7 @@ 1006 VIMLANG=${VIMLANG:-n} 1007 KEYMAP=${KEYMAP:=none} 1008 GRSECURITY_HOST=${GRSECURITY_HOST:-n} 1009 + USE_PACO=${USE_PACO:-n} 1010 1011 else 1012 # 1013 @@ -230,6 +236,8 @@ 978 1014 979 1015 --help | -h ) usage | more && exit ;; 980 1016 981 + --no-paco ) USE_PACO= 0;;1017 + --no-paco ) USE_PACO=n ;; 982 1018 + 983 1019 --optimize | -O ) 984 1020 test $# = 1 && eval "$exit_missing_arg" 985 1021 shift 986 @@ -4 89,6 +491,14 @@1022 @@ -468,6 +476,14 @@ 987 1023 [[ $VERBOSITY > 0 ]] && echo "OK" 988 1024 fi 989 1025 # 990 1026 +# paco module 991 +if [[ "$USE_PACO" = " 1" ]]; then1027 +if [[ "$USE_PACO" = "y" ]]; then 992 1028 + [[ $VERBOSITY > 0 ]] && echo -n "Loading paco module..." 993 1029 + source $COMMON_DIR/paco-functions … … 999 1035 if [[ "$OPTIMIZE" != "0" ]]; then 1000 1036 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..." 1001 @@ -5 35,6 +545,8 @@1037 @@ -514,6 +530,8 @@ 1002 1038 if [[ "$PWD" != "$JHALFSDIR" ]]; then 1003 1039 cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/ 1004 1040 # 1005 + [[ $USE_PACO != " 0" ]] && cp $COMMON_DIR/paco-build-$PROGNAME.sh $JHALFSDIR/1041 + [[ $USE_PACO != "n" ]] && cp $COMMON_DIR/paco-build-$PROGNAME.sh $JHALFSDIR/ 1006 1042 + # 1007 1043 [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/ 1008 1044 # 1009 if [[ "$COMPARE" != "0" ]] ; then 1045 if [[ "$COMPARE" = "y" ]]; then 1046 Index: Config.in 1047 =================================================================== 1048 --- Config.in (revision 3007) 1049 +++ Config.in (working copy) 1050 @@ -655,6 +655,52 @@ 1051 #--- End Advanced Features 1052 endmenu 1053 1054 +#--- PACO 1055 +config USE_PACO 1056 + bool "Use PACO" 1057 + default n 1058 + depends on !BOOK_BLFS && !BOOK_CLFS2 && !LIB_UCLIBC 1059 + 1060 + config PACO_VERSION 1061 + string "PACO package version" 1062 + default "1.10.10" 1063 + depends USE_PACO 1064 + 1065 + config PACO_FILE 1066 + string "PACO package full name" 1067 + default "paco-$PACO_VERSION.tar.bz2" 1068 + depends USE_PACO 1069 + help 1070 + #-- You can use .tar.gz if preferred 1071 + 1072 + config PACO_MIRROR1 1073 + string "Sourceforge mirror 1" 1074 + default "heanet" 1075 + depends USE_PACO 1076 + help 1077 + #-- Sourceforge mirror to use for Paco source download 1078 + # 1079 + # Europe: heanet, belnet, puzzle, surfnet, switch, kent 1080 + # North America: superb-east, superb-west, umn, easynews 1081 + # South America: ufpr 1082 + # Asia: nchc, jaist 1083 + # Australia: optusnet 1084 + 1085 + config PACO_MIRROR2 1086 + string "Sourceforge mirror 2" 1087 + default "kent" 1088 + depends USE_PACO 1089 + help 1090 + #-- Sourceforge mirror to use for Paco source download 1091 + # 1092 + # Europe: heanet, belnet, puzzle, surfnet, switch, kent 1093 + # North America: superb-east, superb-west, umn, easynews 1094 + # South America: ufpr 1095 + # Asia: nchc, jaist 1096 + # Australia: optusnet 1097 +#--- End PACO 1098 + 1099 + 1100 # config CONFIG_BLFS_CMDS 1101 # bool "Add BLFS packages to current build" 1102 # default n
Note:
See TracChangeset
for help on using the changeset viewer.