Changeset 6921b21


Ignore:
Timestamp:
07/30/2006 03:13:03 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0
Children:
d82b935
Parents:
b8020ac
Message:

Updated paco patch from upstream, adapted to 1.0 branch.

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • README.PACO

    rb8020ac r6921b21  
    22#                                         #
    33#   README FILE FOR JHALFS PACO PATCH     #
     4#          By: Tor Olav Stava             #
     5#        (torstava@broadpark.no           #
    46#                                         #
    57###########################################
    6 
    7 
    8 ##### NOTES #####
    9 
    10 Patch author: Tor Olav Stava (t-ol-sta@online.no)
    11 
    12 Any comments directly regarding the patch should be directed to the author
    13 or the ALFS mailing list.
    14 
    15 The patch author is not a member of the ALFS team, and all work is done
    16 on a voluntary basis.
    178
    189
    … …  
    2011
    2112This patch will enable the paco pacKAGE oRGANIZER to be used with jhalfs.
    22 At the moment only the LFS, BLFS, and HLFS-glibc parts are supported.
    23 
    24 
    25 ##### PREREQUISITES #####
    26 
    27 Before using jhalfs you should have some experience with LFS.
    28 
    29 If you don't know what LFS is about, then head over to
    30 http://www.linuxfromscratch.org/lfs and start from there.
     13At the moment only the LFS and HLFS-glibc parts are supported.
    3114
    3215
    … …  
    4023
    41243. Run the wanted script.
    42    (Only ./lfs ./hlfs --model glibc, and ./blfs if you want to use paco)
     25   (Only ./lfs or ./hlfs --model glibc if you want to use paco)
    4326
    44274. Download the paco source package to the $BUILDDIR/sources dir.
    45    paco-1.10.8 or later is recommended.
     28   paco-1.10.10 or later is recommended.
    4629   If using a newer paco version, remember to update also the
    4730   PACO_VERSION variable.
    4831
    49325. Run make.
     33
     34
     35##### PREREQUISITES #####
     36
     37Before using jhalfs you should have some experience with LFS.
     38
     39If you don't know what LFS is about, then head over to
     40http://www.linuxfromscratch.org/lfs and start from there.
     41
     42
     43##### NOTES #####
     44
     45Patch author: Tor Olav Stava (torstava@broadpark.no)
     46Any comments directly regarding the patch should be directed to the author
     47or the ALFS mailing list. The patch author is not a member of the ALFS team,
     48and all work is done on a voluntary basis.
    5049
    5150

  • contrib/jhalfs-paco.patch

    rb8020ac r6921b21  
    11Index: LFS/master.sh
    22===================================================================
    3 --- LFS/master.sh       (revision 2829)
     3--- LFS/master.sh       (revision 2862)
    44+++ LFS/master.sh       (working copy)
    5 @@ -176,6 +176,11 @@
     5@@ -173,6 +173,11 @@
    66     # Keep the script file name
    77     this_script=`basename $file`
    … …  
    1515     # dependencies and target creation.
    1616     case "${this_script}" in
    17 @@ -183,6 +188,18 @@
     17@@ -180,6 +185,18 @@
    1818       *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
    1919     esac
    … …  
    3434     name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
    3535 
    36 @@ -235,7 +252,9 @@
     36@@ -232,7 +249,9 @@
    3737     # and not to use chroot.
    3838     case "${this_script}" in
    … …  
    4545 
    4646     # Remove the build directory(ies) except if the package build fails.
    47 @@ -255,6 +274,16 @@
     47@@ -252,6 +271,16 @@
    4848     PREV=${this_script}${N}
    4949     # Set system_build envar for iteration targets
    … …  
    6262 }
    6363 
    64 @@ -315,8 +344,18 @@
     64@@ -312,8 +341,18 @@
    6565               else
    6666                 wrt_run_as_chroot2 "$this_script" "$file"
    … …  
    8383Index: LFS/lfs.xsl
    8484===================================================================
    85 --- LFS/lfs.xsl (revision 2829)
     85--- LFS/lfs.xsl (revision 2862)
    8686+++ LFS/lfs.xsl (working copy)
    8787@@ -32,6 +32,9 @@
    … …  
    9595     <xsl:apply-templates select="//sect1"/>
    9696   </xsl:template>
    97 @@ -200,6 +203,33 @@
     97@@ -206,6 +209,33 @@
    9898         <xsl:apply-templates/>
    9999         <xsl:text> || true&#xA;</xsl:text>
    … …  
    148148Index: common/config
    149149===================================================================
    150 --- common/config       (revision 2829)
     150--- common/config       (revision 2862)
    151151+++ common/config       (working copy)
    152152@@ -86,6 +86,14 @@
    … …  
    157157+#--- Use paco? 0(no)/1(yes)
    158158+USE_PACO=1
    159 +PACO_VERSION=1.10.8
     159+PACO_VERSION=1.10.10
    160160+
    161161+#--- Name of the Paco source package
    … …  
    177177Index: common/func_validate_configs.sh
    178178===================================================================
    179 --- common/func_validate_configs.sh     (revision 2829)
     179--- common/func_validate_configs.sh     (revision 2862)
    180180+++ common/func_validate_configs.sh     (working copy)
    181181@@ -84,9 +84,9 @@
    … …  
    431431Index: common/common-functions
    432432===================================================================
    433 --- common/common-functions     (revision 2829)
     433--- common/common-functions     (revision 2862)
    434434+++ common/common-functions     (working copy)
    435435@@ -69,6 +69,9 @@
    … …  
    461461Index: HLFS/hlfs.xsl
    462462===================================================================
    463 --- HLFS/hlfs.xsl       (revision 2829)
     463--- HLFS/hlfs.xsl       (revision 2862)
    464464+++ HLFS/hlfs.xsl       (working copy)
    465465@@ -39,6 +39,9 @@
    … …  
    473473     <xsl:apply-templates select="//sect1"/>
    474474   </xsl:template>
    475 @@ -191,6 +194,10 @@
     475@@ -177,6 +180,10 @@
    476476       <!-- Fixing bootscripts installation -->
    477477       <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and
    … …  
    484484         <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;&#xA;</xsl:text>
    485485       </xsl:when>
    486 @@ -257,6 +264,25 @@
     486@@ -237,6 +244,27 @@
    487487         <xsl:apply-templates/>
    488488         <xsl:text> || true&#xA;</xsl:text>
    489489       </xsl:when>
     490+
    490491+      <!-- paco begin -->
    491492+      <!-- General rule -->
    … …  
    495496+                contains(string(),'install')">
    496497+        <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so&#xA;</xsl:text>
    497 +        <xsl:apply-templates/>
     498+        <xsl:apply-templates/> 
    498499+        <xsl:text>&#xA;</xsl:text>
    499500+      </xsl:when>
    500501+      <!-- Linux-libc-headers -->
    501502+      <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
    502 +                ancestor::sect1[@id='ch-system-linux-libc-headers'] and
     503+                ancestor::sect1[@id='ch-system-linux-headers'] and
    503504+                contains(string(),'install ')">
    504505+        <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so&#xA;</xsl:text>
    505 +        <xsl:apply-templates/>
     506+        <xsl:apply-templates/> 
    506507+        <xsl:text>&#xA;</xsl:text>
    507508+      </xsl:when>
    508509+      <!-- paco end -->
     510+
    509511       <!-- The rest of commands -->
    510512       <xsl:otherwise>
    … …  
    512514Index: HLFS/master.sh
    513515===================================================================
    514 --- HLFS/master.sh      (revision 2829)
     516--- HLFS/master.sh      (revision 2862)
    515517+++ HLFS/master.sh      (working copy)
    516 @@ -250,6 +250,11 @@
     518@@ -76,7 +76,9 @@
     519        @echo "export PKGDIR=\$(SRC)" > envars
     520 EOF
     521 ) >> $MKFILE.tmp
     522+      wrt_paco_prep
     523       wrt_run_as_chroot1 "$toolchain" "$this_script"
     524+      wrt_paco_log "`echo $toolchain | sed -e 's@[0-9]\{3\}-@@'`"
     525       ;;
     526 
     527     *)
     528@@ -310,6 +312,11 @@
    517529     # Keep the script file name
    518530     this_script=`basename $file`
    … …  
    526538     case $this_script in
    527539         # We'll run the chroot commands differently than the others, so skip them in the
    528 @@ -259,6 +264,18 @@
     540@@ -319,6 +326,18 @@
    529541       *-stripping* )  [[ "$STRIP" = "0" ]] && continue ;;
    530542     esac
    … …  
    534546+    if [[ -z "$N" ]]; then
    535547+      case $this_script in
    536 +        *linux-libc-headers)
     548+        *linux-headers)
    537549+          TMP_SCRIPT="$this_script"
    538 +          this_script=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'`
     550+          this_script=`echo $this_script | sed -e 's/linux-headers/a-paco/'`
    539551+          wrt_paco_inst "$this_script"
    540552+          this_script="$TMP_SCRIPT" ;;
    … …  
    545557     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
    546558 
    547 @@ -334,7 +351,9 @@
    548          wrt_run_as_root "${this_script}" "${file}"
     559@@ -385,7 +404,9 @@
     560         wrt_RunAsRoot "hlfs" "${this_script}" "${file}"
    549561         ;;
    550562       *)   # The rest of Chapter06
    … …  
    555567     esac
    556568     #
    557 @@ -367,6 +386,16 @@
     569@@ -405,6 +426,16 @@
    558570     PREV=${this_script}${N}
    559571     # Set system_build envar for iteration targets
    … …  
    572584 
    573585 }
    574 @@ -426,9 +455,19 @@
     586@@ -463,9 +494,19 @@
    575587         else  # Initialize the log and run the script
    576588           wrt_run_as_chroot2 "${this_script}" "${file}"
    … …  
    592604     esac
    593605 
     606Index: contrib/jhalfs-paco.patch
     607===================================================================
     608--- contrib/jhalfs-paco.patch   (revision 2862)
     609+++ contrib/jhalfs-paco.patch   (working copy)
     610@@ -1,8 +1,8 @@
     611 Index: LFS/master.sh
     612 ===================================================================
     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 name
     619      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 the
     623      # dependencies and target creation.
     624      case "${this_script}" in
     625-@@ -183,6 +188,18 @@
     626+@@ -180,6 +185,18 @@
     627        *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
     628      esac
     629 
     630@@ -33,7 +33,7 @@
     631      # Grab the name of the target
     632      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}" in
     638        *kernfs)  wrt_run_as_root    "${this_script}" "$file" ;;
     639@@ -44,7 +44,7 @@
     640      esac
     641 
     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 targets
     647      system_build=$chapter6
     648@@ -61,7 +61,7 @@
     649    done # end for file in chapter06/*
     650  }
     651 
     652-@@ -315,8 +344,18 @@
     653+@@ -312,8 +341,18 @@
     654                else
     655                  wrt_run_as_chroot2 "$this_script" "$file"
     656                fi
     657@@ -82,7 +82,7 @@
     658 
     659 Index: LFS/lfs.xsl
     660 ===================================================================
     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&#xA;</xsl:text>
     674        </xsl:when>
     675@@ -147,7 +147,7 @@
     676 +make logme
     677 Index: common/config
     678 ===================================================================
     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=1
     688-+PACO_VERSION=1.10.8
     689++PACO_VERSION=1.10.10
     690 +
     691 +#--- Name of the Paco source package
     692 +PACO_FILE=paco-$PACO_VERSION.tar.*
     693@@ -176,22 +176,24 @@
     694 +LD_PRELOAD=/usr/lib/libpaco-log.so
     695 Index: common/func_validate_configs.sh
     696 ===================================================================
     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_doc
     703 
     704    # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
     705--  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 logme
     729 Index: common/common-functions
     730 ===================================================================
     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 the
     736@@ -442,7 +444,7 @@
     737  ${BOLD}  -O, --optimize${OFF}
     738          Optimize [0-2]
     739            0 = no optimization
     740-@@ -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>&1
     747        ;;
     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.xsl
     757 ===================================================================
     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'] and
     771                  string() = 'make install'">
     772@@ -483,10 +485,11 @@
     773          <xsl:text>make install&#xA;</xsl:text>
     774          <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;&#xA;</xsl:text>
     775        </xsl:when>
     776-@@ -257,6 +264,25 @@
     777+@@ -237,6 +244,27 @@
     778          <xsl:apply-templates/>
     779          <xsl:text> || true&#xA;</xsl:text>
     780        </xsl:when>
     781++
     782 +      <!-- paco begin -->
     783 +      <!-- General rule -->
     784 +      <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
     785@@ -494,26 +497,37 @@
     786 +                contains(string(),'make') and
     787 +                contains(string(),'install')">
     788 +        <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so&#xA;</xsl:text>
     789-+        <xsl:apply-templates/>
     790++        <xsl:apply-templates/>
     791 +        <xsl:text>&#xA;</xsl:text>
     792 +      </xsl:when>
     793 +      <!-- Linux-libc-headers -->
     794 +      <xsl:when test="$use_paco != '0' and $model != 'uclibc' and
     795-+                ancestor::sect1[@id='ch-system-linux-libc-headers'] and
     796++                ancestor::sect1[@id='ch-system-linux-headers'] and
     797 +                contains(string(),'install ')">
     798 +        <xsl:text>export LD_PRELOAD=/usr/lib/libpaco-log.so&#xA;</xsl:text>
     799-+        <xsl:apply-templates/>
     800++        <xsl:apply-templates/>
     801 +        <xsl:text>&#xA;</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.sh
     809 ===================================================================
     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)" > envars
     816+ EOF
     817+ ) >> $MKFILE.tmp
     818++      wrt_paco_prep
     819+       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 name
     826      this_script=`basename $file`
     827 
     828@@ -525,7 +539,7 @@
     829      # Skip this script depending on jhalfs.conf flags set.
     830      case $this_script in
     831          # We'll run the chroot commands differently than the others, so skip them in the
     832-@@ -259,6 +264,18 @@
     833+@@ -319,6 +326,18 @@
     834        *-stripping* )  [[ "$STRIP" = "0" ]] && continue ;;
     835      esac
     836 
     837@@ -533,9 +547,9 @@
     838 +    # linux-libc-headers, except in iterartive builds
     839 +    if [[ -z "$N" ]]; then
     840 +      case $this_script in
     841-+        *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 +      esac
     849@@ -544,8 +558,8 @@
     850      # Grab the name of the target
     851      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 Chapter06
     859 +        wrt_paco_prep
     860@@ -554,7 +568,7 @@
     861         ;;
     862      esac
     863      #
     864-@@ -367,6 +386,16 @@
     865+@@ -405,6 +426,16 @@
     866      PREV=${this_script}${N}
     867      # Set system_build envar for iteration targets
     868      system_build=$chapter6
     869@@ -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 script
     876            wrt_run_as_chroot2 "${this_script}" "${file}"
     877          fi
     878@@ -593,7 +607,7 @@
     879 
     880 Index: master.sh
     881 ===================================================================
     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        shift
     891-@@ -440,6 +442,14 @@
     892+@@ -444,6 +446,14 @@
     893    [[ $VERBOSITY > 0 ]] && echo "OK"
     894  fi
     895  #
     896@@ -619,7 +633,7 @@
     897  # optimize module
     898  if [[ "$OPTIMIZE" != "0" ]]; then
     899    [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..."
     900-@@ -486,6 +496,8 @@
     901+@@ -490,6 +500,8 @@
     902  if [[ "$PWD" != "$JHALFSDIR" ]]; then
     903    cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
     904    #
    594905Index: master.sh
    595906===================================================================
    596 --- master.sh   (revision 2829)
     907--- master.sh   (revision 2862)
    597908+++ master.sh   (working copy)
    598909@@ -149,6 +149,8 @@
Note: See TracChangeset for help on using the changeset viewer.