Changeset f33756b for LFS/master.sh

Timestamp:

10/05/2013 05:52:45 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs

Children:

6216d18c

Parents:

3fed586

Message:

merge trunk r3730:3732

File:

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

LFS/master.sh

@@ -114 +114 @@
     #--------------------------------------------------------------------#
     #
+    # Find the name of the tarball and the version of the package
+    pkg_tarball=$(get_package_tarball_name $name)
+    pkg_version=$(get_package_version $pkg_tarball)
+
     # 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"
-
-    # Find the version of the command files, if it corresponds with the building of
-    # a specific package
-    pkg_tarball=$(get_package_tarball_name $name)
+    LUSER_wrt_target "${this_script}" "$PREV" "$pkg_version"
 
     # If $pkg_tarball isn't empty, we've got a package...
@@ -127 +127 @@
       LUSER_wrt_unpack "$pkg_tarball"
       # If the testsuites must be run, initialize the log file
-      [[ "$TEST" = "3" ]] && LUSER_wrt_test_log "${this_script}"
+      [[ "$TEST" = "3" ]] && LUSER_wrt_test_log "${this_script}" "$pkg_version"
       # If using optimizations, write the instructions
       [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -136 +136 @@
     # The changingowner script must be run as root.
     case "${this_script}" in
-      *changingowner)  wrt_RunAsRoot "$file" ;;
-      *)               LUSER_wrt_RunAsUser "$file" ;;
+      *changingowner)  wrt_RunAsRoot "$file" "$pkg_version" ;;
+      *)               LUSER_wrt_RunAsUser "$file" "$pkg_version" ;;
     esac
 
@@ -214 +214 @@
     # iterations rebuilds
     pkg_tarball=$(get_package_tarball_name $name)
+    pkg_version=$(get_package_version $pkg_tarball)
 
     if [[ "$pkg_tarball" = "" ]] && [[ -n "$N" ]] ; then
@@ -239 +240 @@
     # and not to use chroot.
     case "${this_script}" in
-      *kernfs)  LUSER_wrt_target  "${this_script}" "$PREV" ;;
-      *)        CHROOT_wrt_target "${this_script}" "$PREV" ;;
+      *kernfs)  LUSER_wrt_target  "${this_script}" "$PREV" "$pkg_version" ;;
+      *)        CHROOT_wrt_target "${this_script}" "$PREV" "$pkg_version" ;;
     esac
 
@@ -255 +256 @@
       case $name in
         binutils | gcc | glibc | gmp | mpfr )
-          [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
+          [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" "$pkg_version"
           ;;
         * )
-          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}"
+          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}" "$pkg_version"
           ;;
       esac
@@ -268 +269 @@
     # and not to use chroot.
     case "${this_script}" in
-      *kernfs)  wrt_RunAsRoot  "$file" ;;
-      *)        CHROOT_wrt_RunAsRoot "$file" ;;
+      *kernfs)  wrt_RunAsRoot  "$file" "$pkg_version" ;;
+      *)        CHROOT_wrt_RunAsRoot "$file" "$pkg_version" ;;
     esac