Changeset aafcfa9 for LFS

Timestamp:

09/27/2007 08:41:58 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

41d8577

Parents:

111d25a

Message:

Makefile envars and fuctions revised.

File:

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

LFS/master.sh

@@ -101 +101 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    LUSER_wrt_target "${this_script}" "$PREV"
+    wrt_target "${this_script}" "$PREV"
 
     # Run the script.
@@ -107 +107 @@
     case "${this_script}" in
       *changingowner)  wrt_RunAsRoot "$file" ;;
-      *)               LUSER_wrt_RunAsUser "$file" ;;
+      *)               wrt_RunScript "$file" ;;
     esac
 
@@ -186 +186 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    # In the mount of kernel filesystems we need to set LFS
-    # and not to use chroot.
-    case "${this_script}" in
-      *kernfs)  LUSER_wrt_target  "${this_script}" "$PREV" ;;
-      *)        CHROOT_wrt_target "${this_script}" "$PREV" ;;
-    esac
+    wrt_target  "${this_script}" "$PREV"
 
     # 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
+      wrt_TouchTimestamp
     fi
 
@@ -202 +197 @@
     # and not to use chroot.
     case "${this_script}" in
-      *kernfs)  wrt_RunAsRoot  "$file" ;;
-      *)        CHROOT_wrt_RunAsRoot "$file" ;;
+      *kernfs)  wrt_RunAsRoot "$file" ;;
+      *)        wrt_RunScript "$file" ;;
     esac
 
     # Write installed files log
     if [ "$name" != "" ] && [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then
-      CHROOT_wrt_LogNewFiles "$name"
+      wrt_LogNewFiles "$name"
     fi
 
@@ -255 +250 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    CHROOT_wrt_target "${this_script}" "$PREV"
+    wrt_target "${this_script}" "$PREV"
 
     # For bootscripts and kernel, start INSTALL_LOG if requested
     case "${this_script}" in
       *bootscripts | *kernel ) if [ "${INSTALL_LOG}" = "y" ] ; then
-                                  CHROOT_wrt_TouchTimestamp
-                                fi ;;
+                                 wrt_TouchTimestamp
+                               fi ;;
     esac
 
@@ -267 +262 @@
     case "${this_script}" in
       *fstab) if [[ -n $FSTAB ]]; then
-                CHROOT_wrt_CopyFstab
+                wrt_CopyFstab
               else
-                CHROOT_wrt_RunAsRoot "$file"
-              fi
-        ;;
-      *)        CHROOT_wrt_RunAsRoot "$file"
-        ;;
+                wrt_RunScript "$file"
+              fi ;;
+           *) wrt_RunScript "$file" ;;
     esac
 
     case "${this_script}" in
       *bootscripts)  if [ "${INSTALL_LOG}" = "y" ] ; then
-                       CHROOT_wrt_LogNewFiles "lfs-bootscripts"
+                       wrt_LogNewFiles "lfs-bootscripts"
                      fi ;;
       *kernel)       if [ "${INSTALL_LOG}" = "y" ] ; then
-                       CHROOT_wrt_LogNewFiles "linux"
+                       wrt_LogNewFiles "linux"
                      fi ;;
     esac