Changeset ab7bac5 for CLFS/master.sh


Ignore:
Timestamp:
05/27/2006 09:22:42 PM (18 years ago)
Author:
Jeremy Huntwork <jhuntwork@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
b7faa5a
Parents:
f358747
Message:

Added instructions to always remove source and -build directories before running specific package commands

File:
1 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    rf358747 rab7bac5  
    132132    # If $vrs isn't empty, we've got a package...
    133133    #
    134     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     134    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*"
    135135    #
    136136    wrt_run_as_su "${this_script}" "${file}"
    … …  
    184184    # Insert instructions for unpacking the package and to set the PKGDIR variable.
    185185    #
    186     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     186    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*"
    187187    [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    188188    #
    … …  
    256256    # Insert instructions for unpacking the package and changing directories
    257257    #
    258     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     258    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*"
    259259    [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    260260    #
    … …  
    325325    if [ "$vrs" != "" ] ; then
    326326      case $this_script in
    327         *util-linux)    wrt_unpack  "$name-$vrs.tar.*"  ;;
    328         *)              wrt_unpack2 "$name-$vrs.tar.*"  ;;
     327        *util-linux)    wrt_remove_build_dirs "${name}" && wrt_unpack  "$name-$vrs.tar.*"  ;;
     328        *)              wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"  ;;
    329329      esac
    330330      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    … …  
    386386    #
    387387    case $name in
    388       tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
    389       *)      wrt_unpack2 "$name-$vrs.tar.*"    ;;
     388      tcl)    wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name$vrs-src.tar.*" ;;
     389      *)      wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"    ;;
    390390    esac
    391391    [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    … …  
    441441    #
    442442    case $name in
    443       tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
    444       *)      wrt_unpack3 "$name-$vrs.tar.*"    ;;
     443      tcl)    wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name$vrs-src.tar.*" ;;
     444      *)      wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*"    ;;
    445445    esac
    446446    [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    … …  
    542542    if [ "$vrs" != "" ] ; then
    543543      FILE="$name-$vrs.tar.*"
     544      wrt_remove_build_dirs "${name}"
    544545      wrt_unpack2 "$FILE"
    545546      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    … …  
    645646    if [ "$vrs" != "" ] ; then
    646647      FILE="$name-$vrs.tar.*"
     648      wrt_remove_build_dirs2 "${name}"
    647649      wrt_unpack3 "$FILE"
    648650      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
    … …  
    709711    # If $vrs isn't empty, we've got a package...
    710712    #
    711     [[ "$vrs" != "" ]] && wrt_unpack2 "$name-$vrs.tar.*"
     713    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"
    712714    #
    713715    wrt_run_as_chroot1 "${this_script}" "${file}"
    … …  
    770772    # If $vrs isn't empty, we've got a package...
    771773    #
    772     [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
     774    [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*"
    773775    #
    774776    wrt_run_as_root2 "${this_script}" "${file}"
    … …  
    834836    # Insert instructions for unpacking the package and changing directories
    835837    #
    836     [[ "$vrs" != "" ]] && wrt_unpack2 "$name-$vrs.tar.*"
     838    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"
    837839    #
    838840    # Select a script execution method
    … …  
    912914    # Insert instructions for unpacking the package and changing directories
    913915    #
    914     [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
     916    [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*"
    915917    #
    916918    # Select a script execution method
Note: See TracChangeset for help on using the changeset viewer.