r2587 - jhalfs/trunk/CLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Apr 28 10:40:09 PDT 2006


Author: manuel
Date: 2006-04-28 11:40:09 -0600 (Fri, 28 Apr 2006)
New Revision: 2587

Modified:
   jhalfs/trunk/CLFS/master.sh
Log:
Using wrt_target function and simplified all target in CLFS module.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-04-28 16:55:37 UTC (rev 2586)
+++ jhalfs/trunk/CLFS/master.sh	2006-04-28 17:40:09 UTC (rev 2587)
@@ -127,7 +127,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     #
@@ -178,7 +178,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
@@ -249,7 +249,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     # Insert instructions for unpacking the package and changing directories
@@ -315,7 +315,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     # Insert instructions for unpacking the package and changing directories
@@ -379,7 +379,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     case $name in
       tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
@@ -433,7 +433,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     case $name in
       tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
@@ -493,7 +493,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
 
     # If $vrs isn't empty, we've got a package...
     if [ "$vrs" != "" ] ; then
@@ -559,7 +559,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
 
     # If $vrs isn't empty, we've got a package...
     if [ "$vrs" != "" ] ; then
@@ -624,7 +624,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     #
@@ -685,7 +685,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     #
@@ -748,7 +748,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     # Insert instructions for unpacking the package and changing directories
@@ -826,7 +826,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    echo -e "\n$this_script:  $PREV\n\t@\$(call echo_message, Building)" >> $MKFILE.tmp
+    wrt_target "${this_script}" "$PREV"
     #
     # If $vrs isn't empty, we've got a package...
     # Insert instructions for unpacking the package and changing directories
@@ -1002,12 +1002,7 @@
 (
 	cat << EOF
 
-all:	023-creatingtoolsdir 024-creatingcrossdir 025-addinguser 026-settingenvironment \
-	$cross_tools \
-	$temptools \
-	$chroottools \
-	$boottools
-	@\$(call echo_boot_finished,$VERSION)
+all:	makeboot
 
 makeboot: 023-creatingtoolsdir 024-creatingcrossdir 025-addinguser 026-settingenvironment \
 	$cross_tools\




More information about the alfs-log mailing list