Changeset c10570d

Timestamp:

10/04/2006 10:11:32 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

c93a537

Parents:

6feeca3

Message:

Added blfs-tool support scripts to CLFS, enabled selection in Config.in

Files:

• CLFS/master.sh (modified) (10 diffs)
• Config.in (modified) (2 diffs)
• common/makefile-functions (modified) (1 diff)
• jhalfs (modified) (1 diff)

CLFS/master.sh

@@ -1117 +1117 @@
   $bootable_cmds             # mk_BOOTABLE   (CHROOT) $bootabletools
 
+  # Add the BLFS_TOOL targets, if needed
+  [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
+
   # Add a header, some variables and include the function file
   # to the top of the real Makefile.
@@ -1123 +1126 @@
 $HEADER
 
-SRC          = /sources
-MOUNT_PT     = $BUILDDIR
-PKG_LST      = $PKG_LST
-LUSER        = $LUSER
-LGROUP       = $LGROUP
-SCRIPT_ROOT  = $SCRIPT_ROOT
+SRC            = /sources
+MOUNT_PT       = $BUILDDIR
+PKG_LST        = $PKG_LST
+LUSER          = $LUSER
+LGROUP         = $LGROUP
+SCRIPT_ROOT    = $SCRIPT_ROOT
+ADD_BLFS_TOOLS = $BLFS_TOOL
 
 BASEDIR      = \$(MOUNT_PT)
@@ -1167 +1171 @@
                 -e 's|exit||g' \
                 -e 's|$| -c|' \
-                -e 's|"$$CLFS"|$(MOUNT_PT)|'\
+          P      -e 's|"$$CLFS"|$(MOUNT_PT)|'\
                 -e 's|set -e||'`
     echo -e "CHROOT1= $chroot\n" >> $MKFILE
@@ -1178 +1182 @@
 cat << EOF
 
-all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report
+all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_BLFS_TOOL
         @sudo make do-housekeeping
         @\$(call echo_finished,$VERSION)
@@ -1227 +1231 @@
         @touch \$@
 
-
+mk_BLFS_TOOL: mk_SYSTOOLS
+        @\$(call echo_PHASE,Building BLFS-TOOLS); \\
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
+          sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
+        fi
+        @touch \$@
 
 SETUP:       $host_prep
@@ -1233 +1243 @@
 SUDO:        $orphan_scripts
 CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
+BLFS_TOOL:   $blfs_tool
 
 do-housekeeping:
@@ -1263 +1274 @@
   else echo -e "\t@true\n" >> $MKFILE; fi
 
+
 fi
 
@@ -1276 +1288 @@
         @\$(call echo_boot_finished,$VERSION)
 
-makesys: mk_FINAL
+makesys: mk_FINAL mk_BLFS_TOOL
         @\$(call echo_finished,$VERSION)
 
@@ -1306 +1318 @@
         @touch \$@
 
-mk_SUDO: mk_SYSTOOLS
+mk_SUDO: mk_CROSS
         @sudo make SUDO
         @touch \$@
@@ -1317 +1329 @@
         @touch \$@
 
+mk_BLFS_TOOL: mk_FINAL
+        @\$(call echo_PHASE,Building BLFS-TOOLS)
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          mkdir -p $TRACKING_DIR; \\
+          make BLFS_TOOL; \\
+        fi
+        @touch \$@
+
 SETUP:      $host_prep
 AS_LUSER:   $cross_tools $temptools ${chroottools}${boottools}
 SUDO:       $orphan_scripts
 AS_ROOT:    $testsuitetools $basicsystem $bootscripttools $bootabletools
+BLFS_TOOL:  $blfs_tool
 
 do-housekeeping:

Config.in

@@ -58 +58 @@
 
                 config  BRANCH
-                        bool    "Branch or stable book" if !BOOK_HLFS && !BOOK_CLFS2
+                        bool    "Branch or stable book" if !BOOK_CLFS2
                         help
                                 #-- A supported SVN branch or stable released book
@@ -273 +273 @@
                 default n
 #               depends on !BOOK_BLFS
-                depends on BOOK_LFS
+                depends on BOOK_LFS || BOOK_CLFS
                 help
                         #--- Activating this option additional packages needed to

common/makefile-functions

@@ -18 +18 @@
   @clear
   @echo $(BOLD)--------------------------------------------------------------------------------
-  @echo Executing $(BLUE)$(1)$(WHITE) scripts
+  @echo -e \\t\\tExecuting $(BLUE)$(1)$(WHITE) scripts
   @echo $(BOLD)--------------------------------------------------------------------------------
   #echo $(WHITE)

jhalfs

@@ -131 +131 @@
     TREE=branches/${BRANCH_ID#branch-}/BOOK
     ;;
+  2.4-branch )
+    LFSVRS=${BRANCH_ID}
+    TREE=branches/2.4-branch
+    ;;    
   * )
     case $PROGNAME in