Changeset d82b935
- Timestamp:
- 07/30/2006 04:36:54 PM (18 years ago)
- Branches:
- 1.0
- Children:
- 0a3f3d7
- Parents:
- 6921b21
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
README.PACO
r6921b21 rd82b935 25 25 (Only ./lfs or ./hlfs --model glibc if you want to use paco) 26 26 27 4. Download the paco source package to the $BUILDDIR/sources dir. 28 paco-1.10.10 or later is recommended. 29 If using a newer paco version, remember to update also the 30 PACO_VERSION variable. 31 32 5. Run make. 27 4. Run make. 33 28 34 29 … … 42 37 43 38 ##### NOTES ##### 39 40 Paco-1.10.10 is currently recommended. 41 Remember to update the common/config file is using a newer version. 44 42 45 43 Patch author: Tor Olav Stava (torstava@broadpark.no) … … 68 66 paco Mailing List: 69 67 http://lists.sourceforge.net/lists/listinfo/paco-general 68 69 70 ##### TODO ##### 71 72 - Support for HLFS-uClibc 73 - Support for CLFS 74 - Support for BLFS (when it's ready) 75 - Spread the Word 76 77 78 ##### HISTORY ##### 79 80 2006-07-30 81 - Automatical download of Paco source package 82 - Updated patch to support new HLFS layout -
contrib/jhalfs-paco.patch
r6921b21 rd82b935 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 28 62)3 --- LFS/master.sh (revision 2857) 4 4 +++ LFS/master.sh (working copy) 5 5 @@ -173,6 +173,11 @@ … … 83 83 Index: LFS/lfs.xsl 84 84 =================================================================== 85 --- LFS/lfs.xsl (revision 28 62)85 --- LFS/lfs.xsl (revision 2857) 86 86 +++ LFS/lfs.xsl (working copy) 87 87 @@ -32,6 +32,9 @@ … … 148 148 Index: common/config 149 149 =================================================================== 150 --- common/config (revision 28 62)150 --- common/config (revision 2857) 151 151 +++ common/config (working copy) 152 @@ -86,6 +86, 14@@152 @@ -86,6 +86,23 @@ 153 153 #--- Run farce testing 0(no)/1(yes) 154 154 RUN_FARCE=0 … … 160 160 + 161 161 +#--- Name of the Paco source package 162 +PACO_FILE=paco-$PACO_VERSION.tar.* 162 +PACO_FILE=paco-$PACO_VERSION.tar.bz2 # (use .tar.gz if preferred) 163 + 164 +#--- Sourceforge mirror to use for Paco source download 165 +# Europe: heanet, belnet, puzzle, surfnet, switch, kent 166 +# North America: superb-east, superb-west, umn, easynews 167 +# South America: ufpr 168 +# Asia: nchc, jaist 169 +# Australia: optusnet 170 +PACO_MIRROR1=heanet 171 +PACO_MIRROR2=kent 163 172 + 164 173 #==== INTERNAL VARIABLES ==== 165 174 # Don't edit it unless you know what you are doing 166 175 167 @@ -103,3 +1 11,9 @@176 @@ -103,3 +120,9 @@ 168 177 169 178 #--- farce report log directory … … 177 186 Index: common/func_validate_configs.sh 178 187 =================================================================== 179 --- common/func_validate_configs.sh (revision 28 62)188 --- common/func_validate_configs.sh (revision 2856) 180 189 +++ common/func_validate_configs.sh (working copy) 181 190 @@ -84,9 +84,9 @@ … … 204 213 --- common/paco-functions (revision 0) 205 214 +++ common/paco-functions (revision 0) 206 @@ -0,0 +1,2 09@@215 @@ -0,0 +1,251 @@ 207 216 +#!/bin/bash 208 217 + … … 414 423 +esac 415 424 +} 425 + 426 +#----------------------------------# 427 +get_paco_src() { # 428 +#----------------------------------# 429 +# Download the paco sources 430 +# We don't do any MD5SUM checking as of yet 431 +# http://jaist.dl.sourceforge.net/sourceforge/paco/paco-1.10.10.tar.bz2 432 + 433 +local PACO_URL1="http://$PACO_MIRROR1.dl.sourceforge.net/sourceforge/paco/$PACO_FILE" 434 +local PACO_URL2="http://$PACO_MIRROR2.dl.sourceforge.net/sourceforge/paco/$PACO_FILE" 435 + 436 +# Test if paco is to be used 437 +[ ! "$USE_PACO" = "1" ] && return 438 + 439 +# If the file exists in the archive copy it to the $BUILDDIR/sources dir. 440 +if [ ! -z ${SRC_ARCHIVE} ] && 441 + [ -d ${SRC_ARCHIVE} ] && 442 + [ -f ${SRC_ARCHIVE}/$PACO_FILE ]; then 443 + cp ${SRC_ARCHIVE}/$PACO_FILE . 444 + echo "$PACO_FILE: -- copied from $SRC_ARCHIVE" 445 + fromARCHIVE=1 446 +else 447 + echo "${BOLD}${YELLOW}$PACO_FILE: not found in ${SRC_ARCHIVE}${OFF}" 448 + fromARCHIVE=0 449 + # If the file does not exist yet in /sources download a fresh one 450 + if [ ! -f $PACO_FILE ] ; then 451 + if ! wget $PACO_URL1 && ! wget $PACO_URL2 ; then 452 + gs_wrt_message "$PACO_FILE not found in the SRC_ARCHIVE or on any server..SKIPPING" 453 + continue 454 + fi 455 + fi 456 +fi 457 + 458 +# Copy the freshly downloaded file to the source archive. 459 +if [ ! -z ${SRC_ARCHIVE} ] && 460 + [ -d ${SRC_ARCHIVE} ] && 461 + [ -w ${SRC_ARCHIVE} ] && 462 + [ "$fromARCHIVE" = "0" ] ; then 463 + echo "Storing file:<$PACO_FILE> in the package archive" 464 + cp -f $PACO_FILE ${SRC_ARCHIVE} 465 +fi 466 +} 416 467 Index: common/paco-build-lfs.sh 417 468 =================================================================== … … 431 482 Index: common/common-functions 432 483 =================================================================== 433 --- common/common-functions (revision 28 62)484 --- common/common-functions (revision 2857) 434 485 +++ common/common-functions (working copy) 435 486 @@ -69,6 +69,9 @@ … … 459 510 ;; 460 511 *) exit 1 ;; 512 @@ -810,6 +815,9 @@ 513 # Generate URLs file 514 create_urls 515 516 + # If Paco is to be used, then download the sources 517 + get_paco_src 518 + 519 IFS=$'\x0A' # Modify the 'internal field separator' to break on 'LF' only 520 for line in `cat urls.lst`; do 521 IFS=$saveIFS # Restore the system defaults 461 522 Index: HLFS/hlfs.xsl 462 523 =================================================================== 463 --- HLFS/hlfs.xsl (revision 286 2)524 --- HLFS/hlfs.xsl (revision 2861) 464 525 +++ HLFS/hlfs.xsl (working copy) 465 526 @@ -39,6 +39,9 @@ … … 514 575 Index: HLFS/master.sh 515 576 =================================================================== 516 --- HLFS/master.sh (revision 28 62)577 --- HLFS/master.sh (revision 2857) 517 578 +++ HLFS/master.sh (working copy) 518 579 @@ -76,7 +76,9 @@ … … 604 665 esac 605 666 606 Index: contrib/jhalfs-paco.patch607 ===================================================================608 --- contrib/jhalfs-paco.patch (revision 2862)609 +++ contrib/jhalfs-paco.patch (working copy)610 @@ -1,8 +1,8 @@611 Index: LFS/master.sh612 ===================================================================613 ---- LFS/master.sh (revision 2829)614 +--- LFS/master.sh (revision 2861)615 +++ LFS/master.sh (working copy)616 -@@ -176,6 +176,11 @@617 +@@ -173,6 +173,11 @@618 # Keep the script file name619 this_script=`basename $file`620 621 @@ -14,7 +14,7 @@622 # We'll run the chroot commands differently than the others, so skip them in the623 # dependencies and target creation.624 case "${this_script}" in625 -@@ -183,6 +188,18 @@626 +@@ -180,6 +185,18 @@627 *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;628 esac629 630 @@ -33,7 +33,7 @@631 # Grab the name of the target632 name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`633 634 -@@ -235,7 +252,9 @@635 +@@ -232,7 +249,9 @@636 # and not to use chroot.637 case "${this_script}" in638 *kernfs) wrt_run_as_root "${this_script}" "$file" ;;639 @@ -44,7 +44,7 @@640 esac641 642 # Remove the build directory(ies) except if the package build fails.643 -@@ -255,6 +274,16 @@644 +@@ -252,6 +271,16 @@645 PREV=${this_script}${N}646 # Set system_build envar for iteration targets647 system_build=$chapter6648 @@ -61,7 +61,7 @@649 done # end for file in chapter06/*650 }651 652 -@@ -315,8 +344,18 @@653 +@@ -312,8 +341,18 @@654 else655 wrt_run_as_chroot2 "$this_script" "$file"656 fi657 @@ -82,7 +82,7 @@658 659 Index: LFS/lfs.xsl660 ===================================================================661 ---- LFS/lfs.xsl (revision 2829)662 +--- LFS/lfs.xsl (revision 2861)663 +++ LFS/lfs.xsl (working copy)664 @@ -32,6 +32,9 @@665 <!-- Locale settings -->666 @@ -94,7 +94,7 @@667 <xsl:template match="/">668 <xsl:apply-templates select="//sect1"/>669 </xsl:template>670 -@@ -200,6 +203,33 @@671 +@@ -206,6 +209,33 @@672 <xsl:apply-templates/>673 <xsl:text> || true
</xsl:text>674 </xsl:when>675 @@ -147,7 +147,7 @@676 +make logme677 Index: common/config678 ===================================================================679 ---- common/config (revision 2829)680 +--- common/config (revision 2861)681 +++ common/config (working copy)682 @@ -86,6 +86,14 @@683 #--- Run farce testing 0(no)/1(yes)684 @@ -156,7 +156,7 @@685 +#==== PACO VARIABLES ====686 +#--- Use paco? 0(no)/1(yes)687 +USE_PACO=1688 -+PACO_VERSION=1.10.8689 ++PACO_VERSION=1.10.10690 +691 +#--- Name of the Paco source package692 +PACO_FILE=paco-$PACO_VERSION.tar.*693 @@ -176,22 +176,24 @@694 +LD_PRELOAD=/usr/lib/libpaco-log.so695 Index: common/func_validate_configs.sh696 ===================================================================697 ---- common/func_validate_configs.sh (revision 2829)698 +--- common/func_validate_configs.sh (revision 2861)699 +++ common/func_validate_configs.sh (working copy)700 -@@ -84,9 +84,9 @@701 +@@ -86,10 +86,10 @@702 inline_doc703 704 # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables705 -- 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"706 -- 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"707 -- 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"708 -+ 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"709 -+ 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"710 -+ 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"711 +- 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"712 +- 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"713 +- 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"714 +- 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"715 ++ 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"716 ++ 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"717 ++ 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"718 ++ 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"719 720 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'721 local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'722 -@@ -176,6 +176,7 @@723 +@@ -179,6 +179,7 @@724 [[ "$GETPKG" = "1" ]] && validate_against_str "x0x x1x"725 fi ;;726 RUNMAKE) validate_against_str "x0x x1x" ;;727 @@ -430,7 +432,7 @@728 +make logme729 Index: common/common-functions730 ===================================================================731 ---- common/common-functions (revision 2829)732 +--- common/common-functions (revision 2861)733 +++ common/common-functions (working copy)734 @@ -69,6 +69,9 @@735 in the configuration file has the proper packages and patches for the736 @@ -442,7 +444,7 @@737 ${BOLD} -O, --optimize${OFF}738 Optimize [0-2]739 0 = no optimization740 -@@ -733,6 +736,7 @@741 +@@ -759,6 +762,7 @@742 --stringparam lc_all $LC_ALL \743 --stringparam keymap $KEYMAP \744 --stringparam grsecurity_host $GRSECURITY_HOST \745 @@ -450,7 +452,7 @@746 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1747 ;;748 lfs)749 -@@ -744,6 +748,7 @@750 +@@ -770,6 +774,7 @@751 --stringparam timezone $TIMEZONE \752 --stringparam page $PAGE \753 --stringparam lang $LANG \754 @@ -460,7 +462,7 @@755 *) exit 1 ;;756 Index: HLFS/hlfs.xsl757 ===================================================================758 ---- HLFS/hlfs.xsl (revision 2829)759 +--- HLFS/hlfs.xsl (revision 2861)760 +++ HLFS/hlfs.xsl (working copy)761 @@ -39,6 +39,9 @@762 <xsl:param name="lang" select="C"/>763 @@ -472,7 +474,7 @@764 <xsl:template match="/">765 <xsl:apply-templates select="//sect1"/>766 </xsl:template>767 -@@ -191,6 +194,10 @@768 +@@ -177,6 +180,10 @@769 <!-- Fixing bootscripts installation -->770 <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and771 string() = 'make install'">772 @@ -483,10 +485,11 @@773 <xsl:text>make install
</xsl:text>774 <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;
</xsl:text>775 </xsl:when>776 -@@ -257,6 +264,25 @@777 +@@ -237,6 +244,27 @@778 <xsl:apply-templates/>779 <xsl:text> || true
</xsl:text>780 </xsl:when>781 ++782 + <!-- paco begin -->783 + <!-- General rule -->784 + <xsl:when test="$use_paco != '0' and $model != 'uclibc' and785 @@ -494,26 +497,37 @@786 + contains(string(),'make') and787 + contains(string(),'install')">788 + <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so
</xsl:text>789 -+ <xsl:apply-templates/>790 ++ <xsl:apply-templates/>791 + <xsl:text>
</xsl:text>792 + </xsl:when>793 + <!-- Linux-libc-headers -->794 + <xsl:when test="$use_paco != '0' and $model != 'uclibc' and795 -+ ancestor::sect1[@id='ch-system-linux-libc-headers'] and796 ++ ancestor::sect1[@id='ch-system-linux-headers'] and797 + contains(string(),'install ')">798 + <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so
</xsl:text>799 -+ <xsl:apply-templates/>800 ++ <xsl:apply-templates/>801 + <xsl:text>
</xsl:text>802 + </xsl:when>803 + <!-- paco end -->804 ++805 <!-- The rest of commands -->806 <xsl:otherwise>807 <xsl:apply-templates/>808 Index: HLFS/master.sh809 ===================================================================810 ---- HLFS/master.sh (revision 2829)811 +--- HLFS/master.sh (revision 2861)812 +++ HLFS/master.sh (working copy)813 -@@ -250,6 +250,11 @@814 +@@ -76,7 +76,9 @@815 + @echo "export PKGDIR=\$(SRC)" > envars816 + EOF817 + ) >> $MKFILE.tmp818 ++ wrt_paco_prep819 + wrt_run_as_chroot1 "$toolchain" "$this_script"820 ++ wrt_paco_log "`echo $toolchain | sed -e 's@[0-9]\{3\}-@@'`"821 + ;;822 +823 + *)824 +@@ -310,6 +312,11 @@825 # Keep the script file name826 this_script=`basename $file`827 828 @@ -525,7 +539,7 @@829 # Skip this script depending on jhalfs.conf flags set.830 case $this_script in831 # We'll run the chroot commands differently than the others, so skip them in the832 -@@ -259,6 +264,18 @@833 +@@ -319,6 +326,18 @@834 *-stripping* ) [[ "$STRIP" = "0" ]] && continue ;;835 esac836 837 @@ -533,9 +547,9 @@838 + # linux-libc-headers, except in iterartive builds839 + if [[ -z "$N" ]]; then840 + case $this_script in841 -+ *linux-libc-headers)842 ++ *linux-headers)843 + TMP_SCRIPT="$this_script"844 -+ this_script=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'`845 ++ this_script=`echo $this_script | sed -e 's/linux-headers/a-paco/'`846 + wrt_paco_inst "$this_script"847 + this_script="$TMP_SCRIPT" ;;848 + esac849 @@ -544,8 +558,8 @@850 # Grab the name of the target851 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`852 853 -@@ -334,7 +351,9 @@854 - wrt_run_as_root "${this_script}" "${file}"855 +@@ -385,7 +404,9 @@856 + wrt_RunAsRoot "hlfs" "${this_script}" "${file}"857 ;;858 *) # The rest of Chapter06859 + wrt_paco_prep860 @@ -554,7 +568,7 @@861 ;;862 esac863 #864 -@@ -367,6 +386,16 @@865 +@@ -405,6 +426,16 @@866 PREV=${this_script}${N}867 # Set system_build envar for iteration targets868 system_build=$chapter6869 @@ -571,7 +585,7 @@870 done # end for file in chapter06/*871 872 }873 -@@ -426,9 +455,19 @@874 +@@ -463,9 +494,19 @@875 else # Initialize the log and run the script876 wrt_run_as_chroot2 "${this_script}" "${file}"877 fi878 @@ -593,7 +607,7 @@879 880 Index: master.sh881 ===================================================================882 ---- master.sh (revision 2829)883 +--- master.sh (revision 2861)884 +++ master.sh (working copy)885 @@ -149,6 +149,8 @@886 887 @@ -604,7 +618,7 @@888 --optimize | -O )889 test $# = 1 && eval "$exit_missing_arg"890 shift891 -@@ -440,6 +442,14 @@892 +@@ -444,6 +446,14 @@893 [[ $VERBOSITY > 0 ]] && echo "OK"894 fi895 #896 @@ -619,7 +633,7 @@897 # optimize module898 if [[ "$OPTIMIZE" != "0" ]]; then899 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..."900 -@@ -486,6 +496,8 @@901 +@@ -490,6 +500,8 @@902 if [[ "$PWD" != "$JHALFSDIR" ]]; then903 cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/904 #905 667 Index: master.sh 906 668 =================================================================== 907 --- master.sh (revision 28 62)669 --- master.sh (revision 2856) 908 670 +++ master.sh (working copy) 909 671 @@ -149,6 +149,8 @@
Note:
See TracChangeset
for help on using the changeset viewer.