Changeset ac9bdc7 for LFS/master.sh

Timestamp:

03/24/2012 10:52:07 AM (12 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

48acdd4

Parents:

bb7de70

Message:

LFS/master.sh: add sudo to the create-sbu_du-report.sh command, so that
it can read all the directories for computing the size

File:

• LFS/master.sh (modified) (5 diffs)

LFS/master.sh

@@ -409 +409 @@
   # Add the CUSTOM_TOOLS targets, if needed
   [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target
-  # Add the BLFS_TOOL targets, if needed
-  [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
 
   # Add a header, some variables and include the function file
@@ -441 +439 @@
     cat << EOF
 
-all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL
+all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL mk_CUSTOM_TOOLS
         @sudo make do_housekeeping
         @echo "$VERSION - jhalfs build" > lfs-release && \\
@@ -488 +486 @@
         @touch \$@
 
-mk_CUSTOM_TOOLS: create-sbu_du-report
+mk_BLFS_TOOL: create-sbu_du-report
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+          (sudo \$(CHROOT2) "make -C $BLFS_ROOT/work"); \\
+        fi;
+        @touch \$@
+
+mk_CUSTOM_TOOLS: mk_BLFS_TOOL
         @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
           \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
           sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
           (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\
-        fi;
-        @touch \$@
-
-mk_BLFS_TOOL: mk_CUSTOM_TOOLS
-        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-          \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
-          sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
-          (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL"); \\
         fi;
         @touch \$@
@@ -532 +529 @@
 BOOT:         $chapter78
 CUSTOM_TOOLS: $custom_list
-BLFS_TOOL:    $blfs_tool
 
 
@@ -538 +534 @@
         @\$(call echo_message, Building)
         @if [ "\$(ADD_REPORT)" = "y" ]; then \\
-          ./create-sbu_du-report.sh logs $VERSION; \\
+          sudo ./create-sbu_du-report.sh logs $VERSION; \\
           \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
         fi;