Changeset 1838bc7


Ignore:
Timestamp:
11/12/2006 01:50:34 PM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
d55a1a1
Parents:
1f81129
Message:

Changed how create-sbu_du-report target is created.
Added blfs-tool support to HLFS.

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    r1f81129 r1838bc7  
    11001100        @touch \$@
    11011101
    1102 mk_BLFS_TOOL: mk_SYSTOOLS
    1103         @\$(call echo_PHASE,Building BLFS-TOOLS); \\
     1102mk_BLFS_TOOL: create-sbu_du-report
     1103        @\$(call echo_PHASE,Building BLFS-TOOLS)
    11041104        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
    11051105          sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
    11061106          sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
    1107         fi
     1107        fi;
    11081108        @touch \$@
    11091109
    … …  
    11131113CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
    11141114BLFS_TOOL:   $blfs_tool
     1115
     1116
     1117create-sbu_du-report:  mk_SYSTOOLS
     1118        @\$(call echo_message, Building)
     1119        @if [ "\$(ADD_REPORT)" = "y" ]; then \\
     1120          ./create-sbu_du-report.sh logs $VERSION; \\
     1121          \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
     1122        fi;
     1123        @touch  \$@
    11151124
    11161125do-housekeeping:
    … …  
    11281137EOF
    11291138) >> $MKFILE
    1130 
    1131   # Add SBU-disk_usage report target
    1132   echo "create-sbu_du-report:" >> $MKFILE
    1133   if [[ "$REPORT" = "y" ]] ; then
    1134 (
    1135     cat << EOF
    1136         @\$(call echo_message, Building)
    1137         @./create-sbu_du-report.sh logs $VERSION
    1138         @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
    1139         @touch  \$@
    1140 
    1141 EOF
    1142 ) >> $MKFILE
    1143   else echo -e "\t@true\n" >> $MKFILE; fi
    1144 
    11451139
    11461140fi

  • CLFS2/master.sh

    r1f81129 r1838bc7  
    468468
    469469SETUP:  $host_prep
    470 
    471 LUSER:  $cross_tools $basicsystem $bootscripttools $bootable
    472 
    473 ROOT:   $chowning
    474 
     470LUSER:  $cross_tools $basicsystem $bootscripttools $bootable
     471ROOT:   $chowning
     472
     473
     474create-sbu_du-report:  ROOT
     475        @\$(call echo_message, Building)
     476        @if [ "\$(ADD_REPORT)" = "y" ]; then \\
     477          ./create-sbu_du-report.sh logs $VERSION; \\
     478          \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
     479        fi;
     480        @touch  \$@
    475481
    476482restore-luser-env:
    … …  
    496502) >> $MKFILE
    497503
    498   # Add SBU-disk_usage report target
    499   echo "create-sbu_du-report:" >> $MKFILE
    500   if [[ "$REPORT" = "y" ]] ; then
    501 (
    502     cat << EOF
    503         @\$(call echo_message, Building)
    504         @./create-sbu_du-report.sh logs $VERSION
    505         @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
    506         @touch  \$@
    507 
    508 
    509 EOF
    510 ) >> $MKFILE
    511   else echo -e "\t@true\n\n" >> $MKFILE; fi
    512 
    513504  # Bring over the items from the Makefile.tmp
    514505  cat $MKFILE.tmp >> $MKFILE
    … …  
    517508
    518509}
    519 

  • CLFS3/master.sh

    r1f81129 r1838bc7  
    461461        @touch \$@
    462462
     463
    463464SETUP:  $host_prep
    464 
    465465LUSER:  $cross_tools $basicsystem $bootscripttools $bootable
    466 
    467466ROOT:   $chowning
    468467
     468
     469create-sbu_du-report:  ROOT
     470        @\$(call echo_message, Building)
     471        @if [ "\$(ADD_REPORT)" = "y" ]; then \\
     472          ./create-sbu_du-report.sh logs $VERSION; \\
     473          \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
     474        fi;
     475        @touch  \$@
    469476
    470477restore-luser-env:
    … …  
    490497) >> $MKFILE
    491498
    492   # Add SBU-disk_usage report target
    493   echo "create-sbu_du-report:" >> $MKFILE
    494   if [[ "$REPORT" = "y" ]] ; then
    495 (
    496     cat << EOF
    497         @\$(call echo_message, Building)
    498         @./create-sbu_du-report.sh logs $VERSION
    499         @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
    500         @touch  \$@
    501 
    502 
    503 EOF
    504 ) >> $MKFILE
    505   else echo -e "\t@true\n\n" >> $MKFILE; fi
    506 
    507499  # Bring over the items from the Makefile.tmp
    508500  cat $MKFILE.tmp >> $MKFILE

  • Config.in

    r1f81129 r1838bc7  
    291291                bool    "Add blfs-tool support"
    292292                default n
    293 #               depends on !BOOK_BLFS
    294                 depends on BOOK_LFS || BOOK_CLFS
     293                depends on !BOOK_BLFS && !BOOK_CLFS2 && !BOOK_CLFS3
    295294                help
    296295                        #--- Activating this option additional packages needed to

  • HLFS/master.sh

    r1f81129 r1838bc7  
    523523  cat << EOF
    524524
    525 all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report
     525all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL
    526526        @sudo make do-housekeeping
    527527        @\$(call echo_finished,$VERSION)
    … …  
    567567        @touch \$@
    568568
    569 
    570 SETUP:  $chapter3
    571 
    572 LUSER:  $chapter5
    573 
    574 SUDO:   060-kernfs 062-changingowner
    575 
    576 CHROOT: $chapter6
    577 
    578 BOOT:   $chapter7
    579 
     569mk_BLFS_TOOL: create-sbu_du-report
     570        @\$(call echo_PHASE,Building BLFS-TOOLS)
     571        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
     572          sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
     573          sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
     574        fi;
     575        @touch \$@
     576
     577
     578SETUP:     $chapter3
     579LUSER:     $chapter5
     580SUDO:      060-kernfs 062-changingowner
     581CHROOT:    $chapter6
     582BOOT:      $chapter7
     583BLFS_TOOL: $blfs_tool
     584
     585
     586create-sbu_du-report:  mk_BOOT
     587        @\$(call echo_message, Building)
     588        @if [ "\$(ADD_REPORT)" = "y" ]; then \\
     589          ./create-sbu_du-report.sh logs $VERSION; \\
     590          \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
     591        fi;
     592        @touch  \$@
    580593
    581594restore-luser-env:
    … …  
    609622) >> $MKFILE
    610623
    611   # Add SBU-disk_usage report target
    612   echo "create-sbu_du-report:" >> $MKFILE
    613   if [[ "$REPORT" = "y" ]] ; then
    614 (
    615     cat << EOF
    616         @\$(call echo_message, Building)
    617         @./create-sbu_du-report.sh logs $VERSION
    618         @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
    619         @touch  \$@
    620 
    621 
    622 EOF
    623 ) >> $MKFILE
    624   else echo -e "\t@true\n\n" >> $MKFILE; fi
    625 
    626624  # Bring over the items from the Makefile.tmp
    627625  cat $MKFILE.tmp >> $MKFILE

  • LFS/master.sh

    r1f81129 r1838bc7  
    459459        @touch \$@
    460460
    461 
    462 SETUP:  $chapter4
    463 
    464 LUSER:  $chapter5
    465 
    466 SUDO:   057-changingowner 059-kernfs
    467 
    468 CHROOT: $chapter6
    469 
    470 BOOT:   $chapter789
    471 
     461mk_BLFS_TOOL: create-sbu_du-report
     462        @\$(call echo_PHASE,Building BLFS-TOOLS)
     463        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
     464          sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
     465          sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
     466        fi;
     467        @touch \$@
     468
     469
     470SETUP:     $chapter4
     471LUSER:     $chapter5
     472SUDO:      057-changingowner 059-kernfs
     473CHROOT:    $chapter6
     474BOOT:      $chapter789
     475BLFS_TOOL: $blfs_tool
     476
     477
     478create-sbu_du-report:  mk_BOOT
     479        @\$(call echo_message, Building)
     480        @if [ "\$(ADD_REPORT)" = "y" ]; then \\
     481          ./create-sbu_du-report.sh logs $VERSION; \\
     482          \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
     483        fi;
     484        @touch  \$@
    472485
    473486restore-luser-env:
    … …  
    500513) >> $MKFILE
    501514
    502   # Add SBU-disk_usage report target
    503   echo "create-sbu_du-report:" >> $MKFILE
    504   if [[ "$REPORT" = "y" ]] ; then
    505 (
    506     cat << EOF
    507         @\$(call echo_message, Building)
    508         @./create-sbu_du-report.sh logs $VERSION
    509         @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
    510         @touch  \$@
    511 
    512 
    513 EOF
    514 ) >> $MKFILE
    515   else echo -e "\t@true\n\n" >> $MKFILE; fi
    516 
    517   # Add BLFS_TOOL targets
    518   echo "mk_BLFS_TOOL:" >> $MKFILE
    519   if [[ "$BLFS_TOOL" = "y" ]] ; then
    520 (
    521     cat << EOF
    522         @\$(call echo_CHROOT_request)
    523         @ sudo mkdir -p $BUILDDIR$TRACKING_DIR
    524         @( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL")
    525         @touch \$@
    526 
    527 BLFS_TOOL:  $blfs_tool
    528 
    529 
    530 EOF
    531 ) >> $MKFILE
    532   else echo -e "\t@true\n\n" >> $MKFILE; fi
    533 
    534515  # Bring over the items from the Makefile.tmp
    535516  cat $MKFILE.tmp >> $MKFILE

  • README

    r1f81129 r1838bc7  
    8282
    8383     For books that support it, there is an option to install blfs-tool and its
    84      dependendencies on the final system.
     84     dependendencies on the final system. The pre-made build dependencies
     85     scripts has been written thinking on a LFS build. For CLFS and HLFS
     86     builds you may need to adjust that scripts, that are found into the
     87     common/blfs-tool-deps directory in the jhalfs sources tree.
    8588
    8689     After booting the new xLFS system some steps are needed to finish

  • common/libs/func_wrt_Makefile

    r1f81129 r1838bc7  
    2222LGROUP         = $LGROUP
    2323SCRIPT_ROOT    = $SCRIPT_ROOT
    24 ADD_BLFS_TOOLS = $BLFS_TOOL
    2524
    2625BASEDIR        = \$(MOUNT_PT)
    … …  
    3837PRT_DU         = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
    3938PRT_DU_CR      = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
     39
     40ADD_REPORT     = $REPORT
     41ADD_BLFS_TOOLS = $BLFS_TOOL
     42
    4043
    4144export PATH := \${PATH}:/usr/sbin
Note: See TracChangeset for help on using the changeset viewer.