Changeset 8f2c086

Timestamp:

11/11/2006 09:20:15 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

ca6b261

Parents:

195ed9f

Message:

Functions clean-up.

Files:

• CLFS/master.sh (modified) (3 diffs)
• CLFS2/master.sh (modified) (1 diff)
• CLFS3/master.sh (modified) (1 diff)
• HLFS/master.sh (modified) (1 diff)
• LFS/master.sh (modified) (2 diffs)
• common/libs/func_wrt_Makefile (modified) (5 diffs)

CLFS/master.sh

@@ -358 +358 @@
     #
     if [ "$pkg_tarball" != "" ] ; then
-      case $this_script in
-        *util-linux)      ROOT_Unpack  "$pkg_tarball"  ;;
-        *)              CHROOT_Unpack "$pkg_tarball"  ;;
-      esac
+      CHROOT_Unpack "$pkg_tarball"
       [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     fi
@@ -367 +364 @@
     # Select a script execution method
     case $this_script in
-      *kernfs)      wrt_RunAsRoot         "${this_script}" "${file}"  ;;
-      *util-linux)  ROOT_RunAsRoot        "${file}"  ;;
+      *kernfs)      wrt_RunAsRoot         "${file}"  ;;
       *)            CHROOT_wrt_RunAsRoot  "${file}"  ;;
     esac
@@ -457 +453 @@
        # The following 2 scripts are defined in the /boot directory but need
        # to be run as a root user. Set them up here but run them in another phase
-      *changingowner*)  wrt_RunAsRoot "${this_script}" "${file}"    ;;
-      *devices*)        wrt_RunAsRoot "${this_script}" "${file}"    ;;
+      *changingowner*)  wrt_RunAsRoot "${file}"    ;;
+      *devices*)        wrt_RunAsRoot "${file}"    ;;
       *fstab*)   if [[ -n "$FSTAB" ]]; then
                    LUSER_wrt_CopyFstab

CLFS2/master.sh

@@ -392 +392 @@
                 fi
           ;;
-      *chowning)  wrt_RunAsRoot "${this_script}" "${file}"
+      *chowning)  wrt_RunAsRoot "${file}"
           ;;
               *)  LUSER_wrt_RunAsUser "${file}"

CLFS3/master.sh

@@ -386 +386 @@
                 fi
           ;;
-      *chowning)  wrt_RunAsRoot "${this_script}" "${file}"
+      *chowning)  wrt_RunAsRoot "${file}"
           ;;
               *)  LUSER_wrt_RunAsUser "${file}"

HLFS/master.sh

@@ -363 +363 @@
     case "${this_script}" in
       *kernfs* | *changingowner*)
-        wrt_RunAsRoot "${this_script}" "${file}"
+        wrt_RunAsRoot "${file}"
         ;;
       *)   # The rest of Chapter06

LFS/master.sh

@@ -137 +137 @@
     # The changingowner script must be run as root.
     case "${this_script}" in
-      *changingowner)  wrt_RunAsRoot "${this_script}" "$file" ;;
+      *changingowner)  wrt_RunAsRoot "$file" ;;
       *)               LUSER_wrt_RunAsUser "$file" ;;
     esac
@@ -253 +253 @@
     # and not to use chroot.
     case "${this_script}" in
-      *kernfs)  wrt_RunAsRoot    "${this_script}" "$file" ;;
+      *kernfs)  wrt_RunAsRoot  "$file" ;;
       *)        CHROOT_wrt_RunAsRoot "$file" ;;
     esac

common/libs/func_wrt_Makefile

@@ -127 +127 @@
 
 #----------------------------------#
-ROOT_Unpack() {                    #  An alias, for clairity
-#----------------------------------#
-  local FILE=$1
-  local optSAVE_PREVIOUS=$2
-
-  if [[ "${optSAVE_PREVIOUS}" != "1" ]]; then
-(
-cat << EOF
-        @\$(call remove_existing_dirs,$FILE)
-EOF
-) >> $MKFILE.tmp
-  fi
-
-(
-cat << EOF
-        @\$(call unpack,$FILE)
-        @\$(call get_pkg_root_LUSER)
-EOF
-) >> $MKFILE.tmp
-}
-
-#----------------------------------#
 LUSER_wrt_unpack() {               # Unpack and set 'ROOT' var
 #----------------------------------#
@@ -214 +192 @@
 (
 cat  << EOF
-        @echo "export TEST_LOG=/\$(SCRIPT_ROOT)/test-logs/$TESTLOGFILE" >> envars && \\
+        @echo "export TEST_LOG=\$(crTESTLOGDIR)/$TESTLOGFILE" >> envars && \\
         echo "\$(nl_)\`date\`\$(nl_)" >test-logs/$TESTLOGFILE
 EOF
@@ -229 +207 @@
 #----------------------------------#
   local MOUNT_ENV
-  local this_script=$1
-  local file=$2
+  local file=$1
 
   case ${PROGNAME} in
     lfs   ) MOUNT_ENV="LFS" ;;
-    blfs  ) MOUNT_ENV="BLFS" ;;
     clfs  ) MOUNT_ENV="CLFS" ;;
     clfs2 ) MOUNT_ENV="CLFS" ;;
@@ -251 +227 @@
 
 #----------------------------------#
-ROOT_RunAsRoot() {                 #
-#----------------------------------#
-  local file=$1
-(
-cat << EOF
-        @( time { source envars && \$(CMDSDIR)/$file >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
-        \$(PRT_DU_CR) >>logs/\$@
-EOF
-) >> $MKFILE.tmp
-}
-
-#----------------------------------#
 LUSER_wrt_RunAsUser() {            # Execute script inside time { }, footer to log file
 #----------------------------------#
@@ -281 +245 @@
 (
 cat << EOF
-        @( time { source envars && \$(crCMDSDIR)/$file >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
+        @( time { source envars && \$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@ 2>&1 ; } ) 2>>logs/\$@ && \\
         \$(PRT_DU_CR) >>logs/\$@
 EOF