Changeset c3c4e1d for common/common-functions

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:

• common/common-functions (modified) (2 diffs)

common/common-functions

@@ -229 +229 @@
 
 
+#----------------------------------#
+wrt_unpack2() {                    #
+#----------------------------------#
+  local FILE=$1
+(
+cat  << EOF
+        @\$(call unpack2,$FILE)
+        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
+        echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars
+EOF
+) >> $MKFILE.tmp
+}
+
+
 #=============================#
 wrt_unpack3() {               # Unpack and set 'ROOT' var
@@ -236 +250 @@
 cat  << EOF
         @\$(call unpack3,$FILE)
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
-        echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
-        chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
-EOF
-) >> $MKFILE.tmp
-}
-
-
-#----------------------------------#
-wrt_unpack2() {                    #
-#----------------------------------#
-  local FILE=$1
-(
-cat  << EOF
-        @\$(call unpack2,$FILE)
-        @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
-        echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars
-EOF
-) >> $MKFILE.tmp
-}
-
-
-#=============================#
-wrt_unpack4() {               # Unpack and set 'ROOT' var
-#=============================#
-  local FILE=$1
-(
-cat  << EOF
-        @\$(call unpack4,$FILE)
         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
         echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars