Changeset 4795dfb for contrib


Ignore:
Timestamp:
04/29/2006 04:11:42 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
308e05c
Parents:
0ad851d
Message:

Rediffied paco patch.
This one need be revised and tested by Tor Olav.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/jhalfs-paco.patch

    r0ad851d r4795dfb  
    11Index: LFS/master.sh
    22===================================================================
    3 --- LFS/master.sh       (revision 2588)
     3--- LFS/master.sh       (revision 2598)
    44+++ LFS/master.sh       (working copy)
    5 @@ -157,6 +157,13 @@
     5@@ -183,6 +183,16 @@
    66       *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
    77     esac
    88 
    9 +    # Install paco as the first package in ch6, before installing linux-libc-headers.
    10 +    case "${this_script}" in
    11 +      *linux-libc-headers)
    12 +        PACO_NUM=`echo ${this_script} | sed -e 's/linux-libc-headers/a-paco/'`
    13 +        wrt_paco_inst "$PACO_NUM"
    14 +    esac
    15 +
    16      # First append each name of the script files to a list (this will become
    17      # the names of the targets in the Makefile
    18      chapter6="$chapter6 ${this_script}"
    19 @@ -187,7 +194,9 @@
     9+    # Install paco as the first package in ch6, before installing
     10+    # linux-libc-headers, except in iterartive builds
     11+    if [[ -z "$N" ]]; then
     12+      case $this_script in
     13+        *linux-libc-headers)
     14+          PACO_NUM=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'`
     15+          wrt_paco_inst "$PACO_NUM" ;;
     16+      esac
     17+    fi
     18+
     19     # Grab the name of the target
     20     name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
     21 
     22@@ -225,7 +235,9 @@
    2023     # and not to use chroot.
    2124     case "${this_script}" in
    … …  
    2831 
    2932     # Remove the build directory(ies) except if the package build fails.
    30 @@ -205,6 +214,14 @@
    31  
    32      # Keep the script file name for Makefile dependencies.
    33      PREV=${this_script}
     33@@ -245,6 +257,14 @@
     34     PREV=${this_script}${N}
     35     # Set system_build envar for iteration targets
     36     system_build=$chapter6
    3437+
    3538+    # Reinstalling paco after readsjusting the toolchain.
    … …  
    4346 }
    4447 
    45 @@ -266,6 +283,14 @@
     48@@ -306,6 +326,14 @@
    4649                 wrt_run_as_chroot2 "$this_script" "$file"
    4750               fi
    … …  
    6063Index: LFS/lfs.xsl
    6164===================================================================
    62 --- LFS/lfs.xsl (revision 2588)
     65--- LFS/lfs.xsl (revision 2598)
    6366+++ LFS/lfs.xsl (working copy)
    6467@@ -32,6 +32,9 @@
    … …  
    108111Index: BLFS/master.sh
    109112===================================================================
    110 --- BLFS/master.sh      (revision 2588)
     113--- BLFS/master.sh      (revision 2598)
    111114+++ BLFS/master.sh      (working copy)
    112115@@ -79,6 +79,19 @@
    … …  
    132135Index: BLFS/blfs.xsl
    133136===================================================================
    134 --- BLFS/blfs.xsl       (revision 2588)
     137--- BLFS/blfs.xsl       (revision 2598)
    135138+++ BLFS/blfs.xsl       (working copy)
    136139@@ -159,7 +159,7 @@
    … …  
    145148Index: common/config
    146149===================================================================
    147 --- common/config       (revision 2588)
     150--- common/config       (revision 2598)
    148151+++ common/config       (working copy)
    149 @@ -62,6 +62,23 @@
    150  #    Not used in LFS
    151  KEYMAP=none
    152  
    153 +
     152@@ -75,6 +75,14 @@
     153 #--- Run farce testing 0(no)/1(yes)
     154 RUN_FARCE=0
     155 
    154156+#==== PACO VARIABLES ====
    155 +#--- Use paco? 0/1 0(no)/1(yes)
     157+#--- Use paco? 0(no)/1(yes)
    156158+USE_PACO=1
    157159+PACO_VERSION=1.10.4
    … …  
    160162+PACO_FILE=paco-$PACO_VERSION.tar.*
    161163+
    162 +#--- Variables needed
    163 +# Don't change unless you know what you're doing
     164 #==== INTERNAL VARIABLES ====
     165 # Don't edit it unless you know what you are doing
     166 
     167@@ -87,3 +95,9 @@
     168 
     169 #--- farce report log directory
     170 FARCELOGDIR=$LOGDIR/farce
     171+
     172+#--- Variables needed by paco
    164173+PACO_INCLUDE=/
    165 +PACO_EXCLUDE=/sys:/dev:/proc:/tmp:/usr/src:/usr/share/info/dir
     174+PACO_EXCLUDE=/sys:/dev:/proc:/tmp:/usr/src:/usr/share/info/dir:/jhalfs
    166175+PACO_TMPFILE=/tmp/paco.tmp
    167176+LD_PRELOAD=/usr/lib/libpaco-log.so
    168 +
    169 +
    170  #=== Variables needed by ICA (Not implemented yet :-/)===
    171  #--- Run ICA testing 0/1  0(no)/1(yes)
    172  RUN_ICA=0
    173177Index: common/func_validate_configs.sh
    174178===================================================================
    175 --- common/func_validate_configs.sh     (revision 2588)
     179--- common/func_validate_configs.sh     (revision 2598)
    176180+++ common/func_validate_configs.sh     (working copy)
    177 @@ -83,10 +83,10 @@
     181@@ -84,10 +84,10 @@
    178182 inline_doc
    179183 
    180184   # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
    181185-  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG         DEPEND                TEST"
    182 -  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
    183 -  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
    184 -  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST REPORT STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
    185 +  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG          DEPEND               TEST"
    186 +  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
    187 +  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
    188 +  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE                       TEST REPORT STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
     186-  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
     187-  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
     188-  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
     189+  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG         DEPEND                TEST"
     190+  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
     191+  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
     192+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO HPKG RUNMAKE                       TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
    189193 
    190194   local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
    191195   local -r ERROR_MSG_pt2=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
    192 @@ -128,6 +128,7 @@
    193              continue  ;;
    194          TIMEZONE)  continue;;
    195          MKFILE)    continue;;
    196 +        USE_PACO)  validation_str="x0x x1x";          validate_str; continue ;;
    197          HPKG)      validation_str="x0x x1x";          validate_str; continue ;;
    198          RUNMAKE)   validation_str="x0x x1x";          validate_str; continue ;;
    199          TEST)      validation_str="x0x x1x x2x x3x";  validate_str; continue ;;
     196@@ -179,6 +179,7 @@
     197       # Validate general parameters..
     198       HPKG)       validate_against_str "x0x x1x" ;;
     199       RUNMAKE)    validate_against_str "x0x x1x" ;;
     200+      USE_PACO)   validate_against_str "x0x x1x" ;;
     201       REPORT)     validate_against_str "x0x x1x"
     202                   if [[ "${!config_param}" = "1" ]]; then
     203                     if [[ `type -p bc` ]]; then
    200204Index: common/paco-functions
    201205===================================================================
    … …  
    290294+cat << EOF
    291295+       @if [ -e \$(MOUNT_PT)$PACO_TMPFILE ]; then \\
    292 +               \$(CHROOT1) 'paco -lp $PACKAGE < $PACO_TMPFILE' && \\
     296+               \$(CHROOT1) 'paco -lp+ $PACKAGE < $PACO_TMPFILE' && \\
    293297+               rm -f \$(MOUNT_PT)$PACO_TMPFILE; \\
    294298+       fi;
    … …  
    331335Index: common/common-functions
    332336===================================================================
    333 --- common/common-functions     (revision 2588)
     337--- common/common-functions     (revision 2598)
    334338+++ common/common-functions     (working copy)
    335 @@ -60,6 +60,9 @@
     339@@ -59,6 +59,9 @@
    336340         in the configuration file has the proper packages and patches for the
    337341         book version being processed.
    … …  
    343347         Run test suites  [0-3]
    344348           0 = none
    345 @@ -622,6 +625,7 @@
     349@@ -630,6 +633,7 @@
    346350                  --stringparam lc_all $LC_ALL \
    347351                  --stringparam keymap $KEYMAP \
    … …  
    351355       ;;
    352356     lfs)
    353 @@ -633,6 +637,7 @@
     357@@ -641,6 +645,7 @@
    354358                  --stringparam timezone $TIMEZONE \
    355359                  --stringparam page $PAGE \
    … …  
    361365Index: HLFS/hlfs.xsl
    362366===================================================================
    363 --- HLFS/hlfs.xsl       (revision 2588)
     367--- HLFS/hlfs.xsl       (revision 2598)
    364368+++ HLFS/hlfs.xsl       (working copy)
    365369@@ -39,6 +39,9 @@
    … …  
    412416Index: HLFS/master.sh
    413417===================================================================
    414 --- HLFS/master.sh      (revision 2588)
     418--- HLFS/master.sh      (revision 2598)
    415419+++ HLFS/master.sh      (working copy)
    416 @@ -320,6 +320,13 @@
    417        *) ;;
     420@@ -342,6 +342,16 @@
     421       *-stripping* )  [[ "$STRIP" = "0" ]] && continue ;;
    418422     esac
    419423 
    420 +    # Install paco as the first package in ch6, befire installing linux-libc-headers
    421 +    case $this_script in
    422 +      *linux-libc-headers)
    423 +        PACO_NUM=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'`
    424 +        wrt_paco_inst "$PACO_NUM"
    425 +    esac
    426 +
    427      # First append each name of the script files to a list (this will become
    428      # the names of the targets in the Makefile
    429      chapter6="$chapter6 $this_script"
    430 @@ -378,7 +385,9 @@
     424+    # Install paco as the first package in ch6, before installing
     425+    # linux-libc-headers, except in iterartive builds
     426+    if [[ -z "$N" ]]; then
     427+      case $this_script in
     428+        *linux-libc-headers)
     429+          PACO_NUM=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'`
     430+          wrt_paco_inst "$PACO_NUM" ;;
     431+      esac
     432+    fi
     433+
     434     # Grab the name of the target
     435     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
     436 
     437@@ -411,7 +421,9 @@
    431438         wrt_run_as_root "${this_script}" "${file}"
    432439         ;;
    … …  
    438445     esac
    439446     #
    440 @@ -409,6 +418,14 @@
    441  
    442      # Keep the script file name for Makefile dependencies.
    443      PREV=$this_script
     447@@ -444,6 +456,14 @@
     448     PREV=${this_script}${N}
     449     # Set system_build envar for iteration targets
     450     system_build=$chapter6
    444451+
    445452+    # Reinstall paco after the toolchain has been readjusted.
    … …  
    453460 
    454461 }
    455 @@ -471,6 +488,15 @@
     462@@ -506,6 +526,15 @@
    456463           wrt_run_as_chroot2 "${this_script}" "${file}"
    457464         fi
    … …  
    471478Index: master.sh
    472479===================================================================
    473 --- master.sh   (revision 2588)
     480--- master.sh   (revision 2598)
    474481+++ master.sh   (working copy)
    475 @@ -66,6 +66,11 @@
     482@@ -70,6 +70,11 @@
    476483 source $MODULE
    477484 [[ $? > 0 ]] && echo "$MODULE did not load.." && exit 2
    … …  
    485492 [[ $VERBOSITY > 0 ]] && echo "---------------${nl_}"
    486493 
    487 @@ -149,6 +154,8 @@
     494@@ -152,6 +157,8 @@
    488495 
    489496     --help | -h )  usage | more && exit  ;;
    … …  
    494501       test $# = 1 && eval "$exit_missing_arg"
    495502       shift
    496 @@ -454,6 +461,15 @@
     503@@ -480,6 +487,15 @@
    497504 
    498505 if [[ "$PWD" != "$JHALFSDIR" ]]; then
    … …  
    507514+    fi
    508515+  fi
    509    if [[ -n "$FILES" ]]; then
    510      # pushd/popd necessary to deal with mulitiple files
    511      pushd $PACKAGE_DIR 1> /dev/null
     516   if [[ "$COMPARE" != "0" ]] ; then
     517     mkdir -p $JHALFSDIR/extras
     518     cp extras/* $JHALFSDIR/extras
Note: See TracChangeset for help on using the changeset viewer.