Changeset b7faa5a for CLFS/master.sh

Timestamp:

05/27/2006 10:51:06 PM (18 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

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

Children:

a858a78

Parents:

ab7bac5

Message:

Reverting r2729 until a better solution is found

File:

• CLFS/master.sh (modified) (12 diffs)

CLFS/master.sh

@@ -132 +132 @@
     # If $vrs isn't empty, we've got a package...
     #
-    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     #
     wrt_run_as_su "${this_script}" "${file}"
@@ -184 +184 @@
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
     #
-    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     #
@@ -256 +256 @@
     # Insert instructions for unpacking the package and changing directories
     #
-    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
     #
@@ -325 +325 @@
     if [ "$vrs" != "" ] ; then
       case $this_script in
-        *util-linux)    wrt_remove_build_dirs "${name}" && wrt_unpack  "$name-$vrs.tar.*"  ;;
-        *)              wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"  ;;
+        *util-linux)    wrt_unpack  "$name-$vrs.tar.*"  ;;
+        *)              wrt_unpack2 "$name-$vrs.tar.*"  ;;
       esac
       [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -386 +386 @@
     #
     case $name in
-      tcl)    wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name$vrs-src.tar.*" ;;
-      *)      wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"    ;;
+      tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
+      *)      wrt_unpack2 "$name-$vrs.tar.*"    ;;
     esac
     [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -441 +441 @@
     #
     case $name in
-      tcl)    wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name$vrs-src.tar.*" ;;
-      *)      wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*"    ;;
+      tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
+      *)      wrt_unpack3 "$name-$vrs.tar.*"    ;;
     esac
     [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -542 +542 @@
     if [ "$vrs" != "" ] ; then
       FILE="$name-$vrs.tar.*"
-      wrt_remove_build_dirs "${name}"
       wrt_unpack2 "$FILE"
       [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -646 +645 @@
     if [ "$vrs" != "" ] ; then
       FILE="$name-$vrs.tar.*"
-      wrt_remove_build_dirs2 "${name}"
       wrt_unpack3 "$FILE"
       [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -711 +709 @@
     # If $vrs isn't empty, we've got a package...
     #
-    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack2 "$name-$vrs.tar.*"
     #
     wrt_run_as_chroot1 "${this_script}" "${file}"
@@ -772 +770 @@
     # If $vrs isn't empty, we've got a package...
     #
-    [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
     #
     wrt_run_as_root2 "${this_script}" "${file}"
@@ -836 +834 @@
     # Insert instructions for unpacking the package and changing directories
     #
-    [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack2 "$name-$vrs.tar.*"
     #
     # Select a script execution method
@@ -914 +912 @@
     # Insert instructions for unpacking the package and changing directories
     #
-    [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
     #
     # Select a script execution method