Changeset 799b0d1
- Timestamp:
- 05/01/2006 09:50:33 AM (18 years ago)
- Branches:
- 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 6ca2943
- Parents:
- 15cad16
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
README.PACO
r15cad16 r799b0d1 43 43 44 44 4. Download the paco source package to the $BUILDDIR/sources dir. 45 paco-1.10. 4or later is recommended.45 paco-1.10.7 or later is recommended. 46 46 If using a newer paco version, remember to update also the 47 47 PACO_VERSION variable. -
contrib/jhalfs-paco.patch
r15cad16 r799b0d1 1 1 Index: LFS/master.sh 2 2 =================================================================== 3 --- LFS/master.sh (revision 2 598)3 --- LFS/master.sh (revision 2606) 4 4 +++ LFS/master.sh (working copy) 5 @@ -183,6 +183,1 6@@5 @@ -183,6 +183,18 @@ 6 6 *stripping*) [[ "${STRIP}" = "0" ]] && continue ;; 7 7 esac … … 12 12 + case $this_script in 13 13 + *linux-libc-headers) 14 + PACO_NUM=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'` 15 + wrt_paco_inst "$PACO_NUM" ;; 14 + TMP_SCRIPT="$this_script" 15 + this_script=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'` 16 + wrt_paco_inst "$this_script" 17 + this_script="$TMP_SCRIPT" ;; 16 18 + esac 17 19 + fi … … 20 22 name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'` 21 23 22 @@ -225,7 +23 5,9 @@24 @@ -225,7 +237,9 @@ 23 25 # and not to use chroot. 24 26 case "${this_script}" in … … 31 33 32 34 # Remove the build directory(ies) except if the package build fails. 33 @@ -245,6 +25 7,14@@35 @@ -245,6 +259,16 @@ 34 36 PREV=${this_script}${N} 35 37 # Set system_build envar for iteration targets … … 39 41 + case "${this_script}" in 40 42 + *readjusting) 41 + PACO_NUM=`echo ${this_script} | sed -e 's/readjusting/x-paco/'` 42 + wrt_paco_inst "$PACO_NUM" ;; 43 + TMP_SCRIPT="$this_script" 44 + this_script=`echo ${this_script} | sed -e 's/readjusting/x-paco/'` 45 + wrt_paco_inst "$this_script" 46 + this_script="$TMP_SCRIPT" ;; 43 47 + esac 44 48 + … … 46 50 } 47 51 48 @@ -306,6 +3 26,14 @@52 @@ -306,6 +330,14 @@ 49 53 wrt_run_as_chroot2 "$this_script" "$file" 50 54 fi … … 63 67 Index: LFS/lfs.xsl 64 68 =================================================================== 65 --- LFS/lfs.xsl (revision 2 598)69 --- LFS/lfs.xsl (revision 2606) 66 70 +++ LFS/lfs.xsl (working copy) 67 71 @@ -32,6 +32,9 @@ … … 111 115 Index: BLFS/master.sh 112 116 =================================================================== 113 --- BLFS/master.sh (revision 2 598)117 --- BLFS/master.sh (revision 2606) 114 118 +++ BLFS/master.sh (working copy) 115 119 @@ -79,6 +79,19 @@ … … 135 139 Index: BLFS/blfs.xsl 136 140 =================================================================== 137 --- BLFS/blfs.xsl (revision 2 598)141 --- BLFS/blfs.xsl (revision 2606) 138 142 +++ BLFS/blfs.xsl (working copy) 139 143 @@ -159,7 +159,7 @@ … … 146 150 <xsl:apply-templates select="userinput" mode="screen"/> 147 151 </xsl:otherwise> 152 Index: common/paco-build-hlfs.sh 153 =================================================================== 154 --- common/paco-build-hlfs.sh (revision 0) 155 +++ common/paco-build-hlfs.sh (revision 0) 156 @@ -0,0 +1,11 @@ 157 +#!/bin/sh 158 +set -e 159 + 160 +cd $PKGDIR 161 +./configure --with-pic \ 162 + --disable-static \ 163 + --disable-gpaco \ 164 + --sysconfdir=/etc && 165 +make && 166 +make install && 167 +make logme 148 168 Index: common/config 149 169 =================================================================== 150 --- common/config (revision 2 598)170 --- common/config (revision 2606) 151 171 +++ common/config (working copy) 152 @@ - 75,6 +75,14 @@172 @@ -80,6 +80,14 @@ 153 173 #--- Run farce testing 0(no)/1(yes) 154 174 RUN_FARCE=0 … … 157 177 +#--- Use paco? 0(no)/1(yes) 158 178 +USE_PACO=1 159 +PACO_VERSION=1.10. 4179 +PACO_VERSION=1.10.7 160 180 + 161 181 +#--- Name of the Paco source package … … 165 185 # Don't edit it unless you know what you are doing 166 186 167 @@ - 87,3 +95,9 @@187 @@ -92,3 +100,9 @@ 168 188 169 189 #--- farce report log directory … … 177 197 Index: common/func_validate_configs.sh 178 198 =================================================================== 179 --- common/func_validate_configs.sh (revision 2 598)199 --- common/func_validate_configs.sh (revision 2606) 180 200 +++ common/func_validate_configs.sh (working copy) 181 201 @@ -84,10 +84,10 @@ … … 183 203 184 204 # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables 185 - local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG DEPEND TEST"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"205 - local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG DEPEND TEST" 206 - local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL" 207 - local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG" 208 - local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG" 209 + local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG DEPEND TEST" 210 + local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG KEYMAP PAGE TIMEZONE LANG LC_ALL" 211 + local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE METHOD ARCH TARGET TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG" 212 + local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE USE_PACO GETPKG RUNMAKE TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG VIMLANG PAGE TIMEZONE LANG" 193 213 194 214 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,' … … 196 216 @@ -179,6 +179,7 @@ 197 217 # Validate general parameters.. 198 HPKG)validate_against_str "x0x x1x" ;;218 GETPKG) validate_against_str "x0x x1x" ;; 199 219 RUNMAKE) validate_against_str "x0x x1x" ;; 200 220 + USE_PACO) validate_against_str "x0x x1x" ;; … … 227 247 + 228 248 + # Copy the paco build script to the correct directory and make it executable 229 + cp $JHALFSDIR/paco-build .sh $JHALFSDIR/${PROGNAME}-commands/$paco_file &&249 + cp $JHALFSDIR/paco-build-$PROGNAME.sh $JHALFSDIR/${PROGNAME}-commands/$paco_file && 230 250 + chmod +x $JHALFSDIR/${PROGNAME}-commands/$paco_file 231 251 + … … 319 339 +} 320 340 + 321 Index: common/paco-build .sh322 =================================================================== 323 --- common/paco-build .sh (revision 0)324 +++ common/paco-build .sh (revision 0)341 Index: common/paco-build-lfs.sh 342 =================================================================== 343 --- common/paco-build-lfs.sh (revision 0) 344 +++ common/paco-build-lfs.sh (revision 0) 325 345 @@ -0,0 +1,9 @@ 326 346 +#!/bin/sh … … 335 355 Index: common/common-functions 336 356 =================================================================== 337 --- common/common-functions (revision 2 598)357 --- common/common-functions (revision 2606) 338 358 +++ common/common-functions (working copy) 339 359 @@ -59,6 +59,9 @@ … … 347 367 Run test suites [0-3] 348 368 0 = none 349 @@ - 630,6 +633,7 @@369 @@ -566,6 +569,7 @@ 350 370 --stringparam lc_all $LC_ALL \ 351 371 --stringparam keymap $KEYMAP \ … … 355 375 ;; 356 376 lfs) 357 @@ - 641,6 +645,7 @@377 @@ -577,6 +581,7 @@ 358 378 --stringparam timezone $TIMEZONE \ 359 379 --stringparam page $PAGE \ … … 365 385 Index: HLFS/hlfs.xsl 366 386 =================================================================== 367 --- HLFS/hlfs.xsl (revision 2 598)387 --- HLFS/hlfs.xsl (revision 2606) 368 388 +++ HLFS/hlfs.xsl (working copy) 369 389 @@ -39,6 +39,9 @@ … … 416 436 Index: HLFS/master.sh 417 437 =================================================================== 418 --- HLFS/master.sh (revision 2 598)438 --- HLFS/master.sh (revision 2606) 419 439 +++ HLFS/master.sh (working copy) 420 @@ - 342,6 +342,16@@440 @@ -253,6 +253,18 @@ 421 441 *-stripping* ) [[ "$STRIP" = "0" ]] && continue ;; 422 442 esac … … 427 447 + case $this_script in 428 448 + *linux-libc-headers) 429 + PACO_NUM=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'` 430 + wrt_paco_inst "$PACO_NUM" ;; 449 + TMP_SCRIPT="$this_script" 450 + this_script=`echo $this_script | sed -e 's/linux-libc-headers/a-paco/'` 451 + wrt_paco_inst "$this_script" 452 + this_script="$TMP_SCRIPT" ;; 431 453 + esac 432 454 + fi … … 435 457 name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` 436 458 437 @@ - 411,7 +421,9 @@459 @@ -322,7 +334,9 @@ 438 460 wrt_run_as_root "${this_script}" "${file}" 439 461 ;; … … 445 467 esac 446 468 # 447 @@ - 444,6 +456,14@@469 @@ -355,6 +369,16 @@ 448 470 PREV=${this_script}${N} 449 471 # Set system_build envar for iteration targets … … 453 475 + case "${this_script}" in 454 476 + *readjusting) 455 + PACO_NUM=`echo $this_script | sed -e 's/readjusting/x-paco/'` 456 + wrt_paco_inst "$PACO_NUM" ;; 477 + TMP_SCRIPT="$this_script" 478 + this_script=`echo $this_script | sed -e 's/readjusting/x-paco/'` 479 + wrt_paco_inst "$this_script" 480 + this_script="$TMP_SCRIPT" ;; 457 481 + esac 458 482 + … … 460 484 461 485 } 462 @@ - 506,6 +526,15 @@486 @@ -417,6 +441,15 @@ 463 487 wrt_run_as_chroot2 "${this_script}" "${file}" 464 488 fi … … 478 502 Index: master.sh 479 503 =================================================================== 480 --- master.sh (revision 2 598)504 --- master.sh (revision 2606) 481 505 +++ master.sh (working copy) 482 506 @@ -70,6 +70,11 @@ … … 501 525 test $# = 1 && eval "$exit_missing_arg" 502 526 shift 503 @@ -4 80,6 +487,15 @@527 @@ -468,6 +475,15 @@ 504 528 505 529 if [[ "$PWD" != "$JHALFSDIR" ]]; then … … 507 531 + if [[ $USE_PACO != "0" ]] ; then 508 532 + if [[ $PROGNAME != "blfs" ]]; then 509 + cp $COMMON_DIR/paco-build .sh $JHALFSDIR/533 + cp $COMMON_DIR/paco-build-$PROGNAME.sh $JHALFSDIR/ 510 534 + else 511 535 + echo -e "export PACO_INCLUDE=$PACO_INCLUDE" > $JHALFSDIR/pacovars
Note:
See TracChangeset
for help on using the changeset viewer.