Changeset 6821737
- Timestamp:
- 04/13/2006 04:29:22 PM (18 years ago)
- Branches:
- 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 3570c1c
- Parents:
- 1476df1
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
contrib/jhalfs-paco.patch
r1476df1 r6821737 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 25 20)3 --- LFS/master.sh (revision 2542) 4 4 +++ 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 @@ 6 20 # and not to use chroot. 7 21 case "${this_script}" in … … 14 28 15 29 # Remove the build directory(ies) except if the package build fails. 16 @@ -206,6 +2 08,13@@30 @@ -206,6 +215,14 @@ 17 31 18 32 # Keep the script file name for Makefile dependencies. 19 33 PREV=${this_script} 20 34 + 21 + # Inserting paco build commands35 + # Reinstalling paco after readsjusting the toolchain. 22 36 + 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" ;; 25 40 + esac 26 41 + … … 28 43 } 29 44 30 @@ -267,6 +2 76,14 @@45 @@ -267,6 +284,14 @@ 31 46 wrt_run_as_chroot2 "$this_script" "$file" 32 47 fi … … 45 60 Index: LFS/lfs.xsl 46 61 =================================================================== 47 --- LFS/lfs.xsl (revision 25 20)62 --- LFS/lfs.xsl (revision 2542) 48 63 +++ LFS/lfs.xsl (working copy) 49 64 @@ -32,6 +32,9 @@ … … 93 108 Index: BLFS/master.sh 94 109 =================================================================== 95 --- BLFS/master.sh (revision 25 20)110 --- BLFS/master.sh (revision 2542) 96 111 +++ BLFS/master.sh (working copy) 97 112 @@ -79,6 +79,19 @@ … … 117 132 Index: BLFS/blfs.xsl 118 133 =================================================================== 119 --- BLFS/blfs.xsl (revision 25 20)134 --- BLFS/blfs.xsl (revision 2542) 120 135 +++ BLFS/blfs.xsl (working copy) 121 136 @@ -159,7 +159,7 @@ … … 130 145 Index: common/config 131 146 =================================================================== 132 --- common/config (revision 25 20)147 --- common/config (revision 2542) 133 148 +++ common/config (working copy) 134 149 @@ -58,6 +58,23 @@ … … 158 173 Index: common/func_validate_configs.sh 159 174 =================================================================== 160 --- common/func_validate_configs.sh (revision 25 20)175 --- common/func_validate_configs.sh (revision 2542) 161 176 +++ common/func_validate_configs.sh (working copy) 162 177 @@ -85,10 +85,10 @@ … … 183 198 RUNMAKE) validation_str="x0x x1x"; validate_str; continue ;; 184 199 TEST) validation_str="x0x x1x x2x x3x"; validate_str; continue ;; 185 Index: common/paco-build.sh186 ===================================================================187 --- common/paco-build.sh (revision 0)188 +++ common/paco-build.sh (revision 0)189 @@ -0,0 +1,9 @@190 +#!/bin/sh191 +set -e192 +193 +cd $PKGDIR194 +./configure --disable-gpaco \195 + --sysconfdir=/etc &&196 +make &&197 +make install &&198 +make logme199 200 Property changes on: common/paco-build.sh201 ___________________________________________________________________202 Name: svn:keywords203 + Author Date Revision Id204 205 200 Index: common/paco-functions 206 201 =================================================================== 207 202 --- common/paco-functions (revision 0) 208 203 +++ common/paco-functions (revision 0) 209 @@ -0,0 +1,11 3@@204 @@ -0,0 +1,112 @@ 210 205 +#!/bin/bash 211 206 + … … 218 213 +if [ $PROGNAME = "hlfs" ]; then 219 214 + if [ $MODEL = "uclibc" ]; then 220 + $USE_PACO =0215 + USE_PACO=0 221 216 + fi 222 217 +fi 223 218 + 224 219 +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 229 227 + 230 228 + # Write target, dependency and unpack 231 + wrt_target "$ this_script" "$PREV"229 + wrt_target "$paco_script" "$PREV" 232 230 + wrt_unpack2 "$PACO_FILE" 233 231 + 234 + # Copy the paco build script to the correct directory and make it executable235 + echo -e "\t@cp $JHALFSDIR/paco-build.sh $JHALFSDIR/${PROGNAME}-commands/$file && \\" >> $MKFILE.tmp236 + echo -e "\tchmod +x $JHALFSDIR/${PROGNAME}-commands/$file" >> $MKFILE.tmp237 +238 232 + # Run the script 239 + wrt_run_as_chroot1 "${ this_script}" "${file}"233 + wrt_run_as_chroot1 "${paco_script}" "${paco_file}" 240 234 + 241 235 + # Clean up 242 + wrt_remove_build_dirs " $name"236 + wrt_remove_build_dirs "paco" 243 237 + echo -e '\t@touch $@' >> $MKFILE.tmp 244 238 + 245 239 + # Override the PREV variable 246 + PREV="$ this_script"240 + PREV="$paco_script" 247 241 +fi 248 242 +} … … 256 250 +if [ $PROGNAME = "hlfs" ]; then 257 251 + if [ $MODEL = "uclibc" ]; then 258 + $USE_PACO =0252 + USE_PACO=0 259 253 + fi 260 254 +fi … … 288 282 +if [ $PROGNAME = "hlfs" ]; then 289 283 + if [ $MODEL = "uclibc" ]; then 290 + $USE_PACO =0284 + USE_PACO=0 291 285 + fi 292 286 +fi … … 321 315 +} 322 316 + 323 324 Property changes on: common/paco-functions 325 ___________________________________________________________________ 326 Name: svn:keywords 327 + Author Date Revision Id 328 317 Index: 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 329 331 Index: common/common-functions 330 332 =================================================================== 331 --- common/common-functions (revision 25 20)333 --- common/common-functions (revision 2542) 332 334 +++ common/common-functions (working copy) 333 335 @@ -60,6 +60,9 @@ … … 359 361 Index: HLFS/hlfs.xsl 360 362 =================================================================== 361 --- HLFS/hlfs.xsl (revision 25 20)363 --- HLFS/hlfs.xsl (revision 2542) 362 364 +++ HLFS/hlfs.xsl (working copy) 363 365 @@ -39,6 +39,9 @@ … … 410 412 Index: HLFS/master.sh 411 413 =================================================================== 412 --- HLFS/master.sh (revision 25 20)414 --- HLFS/master.sh (revision 2542) 413 415 +++ 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 @@ 415 431 wrt_run_as_root "${this_script}" "${file}" 416 432 ;; … … 422 438 esac 423 439 # 424 @@ -407,6 +4 09,13@@440 @@ -407,6 +416,14 @@ 425 441 426 442 # Keep the script file name for Makefile dependencies. 427 443 PREV=$this_script 428 444 + 429 + # Inserting paco build commands445 + # Reinstall paco after the toolchain has been readjusted. 430 446 + 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" ;; 433 450 + esac 434 451 + … … 436 453 437 454 } 438 @@ -469,6 +4 78,15 @@455 @@ -469,6 +486,15 @@ 439 456 wrt_run_as_chroot2 "${this_script}" "${file}" 440 457 fi … … 454 471 Index: master.sh 455 472 =================================================================== 456 --- master.sh (revision 25 20)473 --- master.sh (revision 2542) 457 474 +++ master.sh (working copy) 458 475 @@ -66,6 +66,11 @@
Note:
See TracChangeset
for help on using the changeset viewer.