Changeset c3c4e1d for CLFS

Timestamp:

03/19/2006 11:14:42 AM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

ad71d98

Parents:

c0cbd50

Message:

Simplified unpack code due tar >= 1.5 prerequisite.
If both bz2 and gz formats of the same package are found in the sources dir, only the more recent one is unpacked.

File:

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

CLFS/master.sh

@@ -288 +288 @@
     # If $vrs isn't empty, we've got a package...
     #
-    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar" &&  echo -e '\ttrue' >> $MKFILE.tmp
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" &&  echo -e '\ttrue' >> $MKFILE.tmp
     #
     wrt_run_as_lfs "${this_script}" "${file}"
@@ -340 +340 @@
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
     #
-    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar" && echo -e '\ttrue' >> $MKFILE.tmp
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" && echo -e '\ttrue' >> $MKFILE.tmp
     #
     wrt_run_as_lfs "${this_script}" "${file}"
@@ -412 +412 @@
     # Insert instructions for unpacking the package and changing directories
     #
-    [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     #
     # Select a script execution method
@@ -489 +489 @@
     if [ "$vrs" != "" ] ; then
       case $this_script in
-        *util-linux)    wrt_unpack  "$name-$vrs.tar"
+        *util-linux)    wrt_unpack  "$name-$vrs.tar.*"
                         echo -e '\ttrue' >> $MKFILE.tmp
             ;;
@@ -552 +552 @@
     #
     case $name in
-      tcl)    wrt_unpack2 "$name$vrs-src.tar" ;;
-      *)      wrt_unpack2 "$name-$vrs.tar"    ;;
+      tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
+      *)      wrt_unpack2 "$name-$vrs.tar.*"    ;;
     esac
     #
@@ -605 +605 @@
     #
     case $name in
-      tcl)    wrt_unpack4 "$name$vrs-src.tar.*" ;;
-      *)      wrt_unpack4 "$name-$vrs.tar.*"    ;;
+      tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
+      *)      wrt_unpack3 "$name-$vrs.tar.*"    ;;
     esac
     #
@@ -819 +819 @@
     if [ "$vrs" != "" ] ; then
       case $name in
-        temp-perl) wrt_unpack4 "perl-$vrs.tar.*"    ;;
-        *)         wrt_unpack4 "$name-$vrs.tar.*"   ;;
+        temp-perl) wrt_unpack3 "perl-$vrs.tar.*"    ;;
+        *)         wrt_unpack3 "$name-$vrs.tar.*"   ;;
       esac
       #
@@ -986 +986 @@
     # If $vrs isn't empty, we've got a package...
     #
-    [[ "$vrs" != "" ]] && wrt_unpack4 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
     #
     wrt_run_as_root2 "${this_script}" "${file}"
@@ -1057 +1057 @@
     # Insert instructions for unpacking the package and changing directories
     #
-    [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
     #
     # Select a script execution method
@@ -1101 +1101 @@
     case $this_script in
       *grub*)     continue  ;;
-      *kernel) 
+      *kernel)
                # if there is no kernel config file do not build the kernel
                [[ -z $CONFIG ]] && continue
@@ -1142 +1142 @@
     # Insert instructions for unpacking the package and changing directories
     #
-    [[ "$vrs" != "" ]] && wrt_unpack4 "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*"
     #
     # Select a script execution method