Changeset 6821737 for contrib


Ignore:
Timestamp:
04/13/2006 04:29:22 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:
3570c1c
Parents:
1476df1
Message:

Updated paco patch.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/jhalfs-paco.patch

    r1476df1 r6821737  
    11Index: LFS/master.sh
    22===================================================================
    3 --- LFS/master.sh       (revision 2520)
     3--- LFS/master.sh       (revision 2542)
    44+++ LFS/master.sh       (working copy)
    5 @@ -188,7 +188,9 @@
     5@@ -158,6 +158,13 @@
     6       *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
     7     esac
     8 
     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@@ -188,7 +195,9 @@
    620     # and not to use chroot.
    721     case "${this_script}" in
    … …  
    1428 
    1529     # Remove the build directory(ies) except if the package build fails.
    16 @@ -206,6 +208,13 @@
     30@@ -206,6 +215,14 @@
    1731 
    1832     # Keep the script file name for Makefile dependencies.
    1933     PREV=${this_script}
    2034+
    21 +    # Inserting paco build commands
     35+    # Reinstalling paco after readsjusting the toolchain.
    2236+    case "${this_script}" in
    23 +      *devices)      wrt_paco_inst "065.5" ;;
    24 +      *readjusting)  wrt_paco_inst "069.5" ;;
     37+      *readjusting)
     38+        PACO_NUM=`echo ${this_script} | sed -e 's/readjusting/x-paco/'`
     39+        wrt_paco_inst "$PACO_NUM" ;;
    2540+    esac
    2641+
    … …  
    2843 }
    2944 
    30 @@ -267,6 +276,14 @@
     45@@ -267,6 +284,14 @@
    3146                 wrt_run_as_chroot2 "$this_script" "$file"
    3247               fi
    … …  
    4560Index: LFS/lfs.xsl
    4661===================================================================
    47 --- LFS/lfs.xsl (revision 2520)
     62--- LFS/lfs.xsl (revision 2542)
    4863+++ LFS/lfs.xsl (working copy)
    4964@@ -32,6 +32,9 @@
    … …  
    93108Index: BLFS/master.sh
    94109===================================================================
    95 --- BLFS/master.sh      (revision 2520)
     110--- BLFS/master.sh      (revision 2542)
    96111+++ BLFS/master.sh      (working copy)
    97112@@ -79,6 +79,19 @@
    … …  
    117132Index: BLFS/blfs.xsl
    118133===================================================================
    119 --- BLFS/blfs.xsl       (revision 2520)
     134--- BLFS/blfs.xsl       (revision 2542)
    120135+++ BLFS/blfs.xsl       (working copy)
    121136@@ -159,7 +159,7 @@
    … …  
    130145Index: common/config
    131146===================================================================
    132 --- common/config       (revision 2520)
     147--- common/config       (revision 2542)
    133148+++ common/config       (working copy)
    134149@@ -58,6 +58,23 @@
    … …  
    158173Index: common/func_validate_configs.sh
    159174===================================================================
    160 --- common/func_validate_configs.sh     (revision 2520)
     175--- common/func_validate_configs.sh     (revision 2542)
    161176+++ common/func_validate_configs.sh     (working copy)
    162177@@ -85,10 +85,10 @@
    … …  
    183198         RUNMAKE)   validation_str="x0x x1x";          validate_str; continue ;;
    184199         TEST)      validation_str="x0x x1x x2x x3x";  validate_str; continue ;;
    185 Index: common/paco-build.sh
    186 ===================================================================
    187 --- common/paco-build.sh        (revision 0)
    188 +++ common/paco-build.sh        (revision 0)
    189 @@ -0,0 +1,9 @@
    190 +#!/bin/sh
    191 +set -e
    192 +
    193 +cd $PKGDIR
    194 +./configure --disable-gpaco \
    195 +       --sysconfdir=/etc &&
    196 +make &&
    197 +make install &&
    198 +make logme
    199 
    200 Property changes on: common/paco-build.sh
    201 ___________________________________________________________________
    202 Name: svn:keywords
    203    + Author Date Revision Id
    204 
    205200Index: common/paco-functions
    206201===================================================================
    207202--- common/paco-functions       (revision 0)
    208203+++ common/paco-functions       (revision 0)
    209 @@ -0,0 +1,113 @@
     204@@ -0,0 +1,112 @@
    210205+#!/bin/bash
    211206+
    … …  
    218213+if [ $PROGNAME = "hlfs" ]; then
    219214+  if [ $MODEL = "uclibc" ]; then
    220 +    $USE_PACO = 0
     215+    USE_PACO=0
    221216+  fi
    222217+fi
    223218+
    224219+if [ $USE_PACO != 0 ]; then
    225 +  name="paco"
    226 +  this_script="$1-$name"
    227 +  file="chapter06/$this_script"
    228 +  chapter6="$chapter6 $this_script"
     220+  paco_script="$1"
     221+  paco_file="chapter06/$paco_script"
     222+  chapter6="$chapter6 $paco_script"
     223+
     224+  # Copy the paco build script to the correct directory and make it executable
     225+  cp $JHALFSDIR/paco-build.sh $JHALFSDIR/${PROGNAME}-commands/$paco_file &&
     226+  chmod +x $JHALFSDIR/${PROGNAME}-commands/$paco_file
    229227+
    230228+  # Write target, dependency and unpack
    231 +  wrt_target "$this_script" "$PREV"
     229+  wrt_target "$paco_script" "$PREV"
    232230+  wrt_unpack2 "$PACO_FILE"
    233231+
    234 +  # Copy the paco build script to the correct directory and make it executable
    235 +  echo -e "\t@cp $JHALFSDIR/paco-build.sh $JHALFSDIR/${PROGNAME}-commands/$file && \\" >> $MKFILE.tmp
    236 +  echo -e "\tchmod +x $JHALFSDIR/${PROGNAME}-commands/$file" >> $MKFILE.tmp
    237 +
    238232+  # Run the script
    239 +  wrt_run_as_chroot1 "${this_script}" "${file}"
     233+  wrt_run_as_chroot1 "${paco_script}" "${paco_file}"
    240234+
    241235+  # Clean up
    242 +  wrt_remove_build_dirs "$name"
     236+  wrt_remove_build_dirs "paco"
    243237+  echo -e '\t@touch $@' >> $MKFILE.tmp
    244238+
    245239+  # Override the PREV variable
    246 +  PREV="$this_script"
     240+  PREV="$paco_script"
    247241+fi
    248242+}
    … …  
    256250+if [ $PROGNAME = "hlfs" ]; then
    257251+  if [ $MODEL = "uclibc" ]; then
    258 +    $USE_PACO = 0
     252+    USE_PACO=0
    259253+  fi
    260254+fi
    … …  
    288282+if [ $PROGNAME = "hlfs" ]; then
    289283+  if [ $MODEL = "uclibc" ]; then
    290 +    $USE_PACO = 0
     284+    USE_PACO=0
    291285+  fi
    292286+fi
    … …  
    321315+}
    322316+
    323 
    324 Property changes on: common/paco-functions
    325 ___________________________________________________________________
    326 Name: svn:keywords
    327    + Author Date Revision Id
    328 
     317Index: common/paco-build.sh
     318===================================================================
     319--- common/paco-build.sh        (revision 0)
     320+++ common/paco-build.sh        (revision 0)
     321@@ -0,0 +1,9 @@
     322+#!/bin/sh
     323+set -e
     324+
     325+cd $PKGDIR
     326+./configure --disable-gpaco \
     327+       --sysconfdir=/etc &&
     328+make &&
     329+make install &&
     330+make logme
    329331Index: common/common-functions
    330332===================================================================
    331 --- common/common-functions     (revision 2520)
     333--- common/common-functions     (revision 2542)
    332334+++ common/common-functions     (working copy)
    333335@@ -60,6 +60,9 @@
    … …  
    359361Index: HLFS/hlfs.xsl
    360362===================================================================
    361 --- HLFS/hlfs.xsl       (revision 2520)
     363--- HLFS/hlfs.xsl       (revision 2542)
    362364+++ HLFS/hlfs.xsl       (working copy)
    363365@@ -39,6 +39,9 @@
    … …  
    410412Index: HLFS/master.sh
    411413===================================================================
    412 --- HLFS/master.sh      (revision 2520)
     414--- HLFS/master.sh      (revision 2542)
    413415+++ HLFS/master.sh      (working copy)
    414 @@ -376,7 +376,9 @@
     416@@ -318,6 +318,13 @@
     417       *) ;;
     418     esac
     419 
     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@@ -376,7 +383,9 @@
    415431         wrt_run_as_root "${this_script}" "${file}"
    416432         ;;
    … …  
    422438     esac
    423439     #
    424 @@ -407,6 +409,13 @@
     440@@ -407,6 +416,14 @@
    425441 
    426442     # Keep the script file name for Makefile dependencies.
    427443     PREV=$this_script
    428444+
    429 +    # Inserting paco build commands
     445+    # Reinstall paco after the toolchain has been readjusted.
    430446+    case "${this_script}" in
    431 +      *devices)      wrt_paco_inst "068.5" ;;
    432 +      *readjusting)  wrt_paco_inst "073.5" ;;
     447+      *readjusting)
     448+        PACO_NUM=`echo $this_script | sed -e 's/readjusting/x-paco/'`
     449+        wrt_paco_inst "$PACO_NUM" ;;
    433450+    esac
    434451+
    … …  
    436453 
    437454 }
    438 @@ -469,6 +478,15 @@
     455@@ -469,6 +486,15 @@
    439456           wrt_run_as_chroot2 "${this_script}" "${file}"
    440457         fi
    … …  
    454471Index: master.sh
    455472===================================================================
    456 --- master.sh   (revision 2520)
     473--- master.sh   (revision 2542)
    457474+++ master.sh   (working copy)
    458475@@ -66,6 +66,11 @@
Note: See TracChangeset for help on using the changeset viewer.