Changeset f5f857d for LFS/master.sh

Timestamp:

09/25/2007 09:34:03 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

c5ae20a

Parents:

5a4f6a7

Message:

Set $TEST_LOG from inside the build scripts.
There is no need now to use the envars file.
Optimize support must be moved to an XSL-based code.

File:

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

LFS/master.sh

@@ -52 +52 @@
         echo "umask 022" >> \$(LUSER_HOME)/.bashrc && \\
         echo "LFS=\$(MOUNT_PT)" >> \$(LUSER_HOME)/.bashrc && \\
-        echo "SRCDIR=\$(MOUNT_PT)/sources" >> \$(LUSER_HOME)/.bashrc && \\
         echo "LC_ALL=POSIX" >> \$(LUSER_HOME)/.bashrc && \\
         echo "PATH=/tools/bin:/bin:/usr/bin" >> \$(LUSER_HOME)/.bashrc && \\
         echo "export LFS LC_ALL PATH" >> \$(LUSER_HOME)/.bashrc && \\
         echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc && \\
-        chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
-        touch envars && \\
-        chown \$(LUSER) envars
+        chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc
         @\$(call housekeeping)
 EOF
@@ -96 +93 @@
     esac
 
-    # Grab the package name, if the script is building a package
-    name=`grep "^PACKAGE=" ${file} | sed -e 's@PACKAGE=@@'`
-
     # Set the dependency for the first target.
     if [ -z $PREV ] ; then PREV=04_04-settingenvironment ; fi
@@ -109 +103 @@
     # as a dependency. Also call the echo_message function.
     LUSER_wrt_target "${this_script}" "$PREV"
-
-    # If $name isn't empty, we've got a package...
-    if [ "$name" != "" ] ; then
-      # If the testsuites must be run, initialize the log file
-      [[ "$TEST" = "3" ]] && LUSER_wrt_test_log "${this_script}"
-      # If using optimizations, write the instructions
-      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
-    fi
 
     # Run the script.
@@ -176 +162 @@
     esac
 
-    # Grab the name of the target.
+    # Grab the name of the package, if any.
     name=`grep "^PACKAGE=" ${file} | sed -e 's@PACKAGE=@@'`
 
@@ -208 +194 @@
     esac
 
-    # If $name isn't empty, we've got a package...
-    if [ "$name" != "" ] ; then
-      # Touch timestamp file if installed files logs will be created.
-      # But only for the firt build when running iterative builds.
-      if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then
-        CHROOT_wrt_TouchTimestamp
-      fi
-      # If the testsuites must be run, initialize the log file
-      case $name in
-        binutils | gcc | glibc )
-          [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
-          ;;
-        * )
-          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}"
-          ;;
-      esac
-      # If using optimizations, write the instructions
-      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+    # Touch timestamp file if installed files logs will be created.
+    # But only for the firt build when running iterative builds.
+    if [ "$name" != "" ] && [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then
+      CHROOT_wrt_TouchTimestamp
     fi
 
@@ -363 +335 @@
             sed -e "s@chroot@$CHROOT_LOC@" \
                 -e 's@ \\\@ @g' \
+                -e 's/  */ /g' \
                 -e 's|\\$|&&|g' \
                 -e 's|"$$LFS"|$(MOUNT_PT)|' \