Changeset f546320 for CLFS/master.sh
- Timestamp:
- 06/03/2007 09:06:13 AM (17 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 05760bc
- Parents:
- 350625a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS/master.sh
r350625a rf546320 511 511 # If $pkg_tarball isn't empty, we've got a package... 512 512 if [ "$pkg_tarball" != "" ] ; then 513 # Touch timestamp file if installed files logs will be created. 514 # But only for the firt build when running iterative builds. 515 if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then 516 CHROOT_wrt_TouchTimestamp 517 fi 513 518 CHROOT_Unpack "$pkg_tarball" 514 519 # If the testsuites must be run, initialize the log file … … 527 532 CHROOT_wrt_RunAsRoot "${file}" 528 533 # 529 [[ "$pkg_tarball" != "" ]] && CHROOT_wrt_RemoveBuildDirs "${name}" 530 # 531 # Include a touch of the target name so make can check if it's already been made. 534 # Write installed files log and remove the build directory(ies) 535 # except if the package build fails. 536 if [ "$pkg_tarball" != "" ] ; then 537 CHROOT_wrt_RemoveBuildDirs "$name" 538 if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then 539 CHROOT_wrt_LogNewFiles "$name" 540 fi 541 fi 542 # 543 # Include a touch of the target name so make can check 544 # if it's already been made. 532 545 wrt_touch 533 546 # … … 590 603 # If $pkg_tarball isn't empty, we've got a package... 591 604 # 592 [[ "$pkg_tarball" != "" ]] && CHROOT_Unpack "$pkg_tarball" 605 if [ "$pkg_tarball" != "" ] ; then 606 if [ "${INSTALL_LOG}" = "y" ] ; then 607 CHROOT_wrt_LogNewFiles "$name" 608 fi 609 CHROOT_Unpack "$pkg_tarball" 610 fi 593 611 # 594 612 CHROOT_wrt_RunAsRoot "${file}" 595 613 # 596 [[ "$pkg_tarball" != "" ]] && CHROOT_wrt_RemoveBuildDirs "${name}" 614 # Write installed files log and remove the build directory(ies) 615 # except if the package build fails. 616 if [ "$pkg_tarball" != "" ] ; then 617 CHROOT_wrt_RemoveBuildDirs "$name" 618 if [ "${INSTALL_LOG}" = "y" ] ; then 619 CHROOT_wrt_LogNewFiles "$name" 620 fi 621 fi 597 622 # 598 623 # Include a touch of the target name so make can check if it's already been made. … … 659 684 # Insert instructions for unpacking the package and changing directories 660 685 # 661 [[ "$pkg_tarball" != "" ]] && CHROOT_Unpack "$pkg_tarball" 686 if [ "$pkg_tarball" != "" ] ; then 687 if [ "${INSTALL_LOG}" = "y" ] ; then 688 CHROOT_wrt_LogNewFiles "$name" 689 fi 690 CHROOT_Unpack "$pkg_tarball" 691 fi 662 692 # 663 693 # Select a script execution method … … 673 703 esac 674 704 # 675 # Housekeeping...remove any build directory(ies) except if the package build fails. 676 [[ "$pkg_tarball" != "" ]] && CHROOT_wrt_RemoveBuildDirs "${name}" 705 # Write installed files log and remove the build directory(ies) 706 # except if the package build fails. 707 if [ "$pkg_tarball" != "" ] ; then 708 CHROOT_wrt_RemoveBuildDirs "$name" 709 if [ "${INSTALL_LOG}" = "y" ] ; then 710 CHROOT_wrt_LogNewFiles "$name" 711 fi 712 fi 677 713 # 678 714 # Include a touch of the target name so make can check if it's already been made.
Note:
See TracChangeset
for help on using the changeset viewer.