Changeset be9970b

Timestamp:

10/28/2005 06:48:53 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

1fb586e

Parents:

bf1c3ba

Message:

Now packages in tar.gz format are supported also.

Files:

• dump-lfs-scripts.xsl (modified) (1 diff)
• functions (modified) (1 diff)
• jhalfs (modified) (3 diffs)

dump-lfs-scripts.xsl

@@ -100 +100 @@
       <xsl:when test="contains(string(),'tar.gz')">
         <xsl:value-of select="substring-before(string(),'tar.gz')"/>
-        <xsl:text>tar.bz2</xsl:text>
+        <xsl:text>tar.*</xsl:text>
         <xsl:value-of select="substring-after(string(),'tar.gz')"/>
         <xsl:text>&#xA;</xsl:text>

functions

@@ -14 +14 @@
 
 define unpack
-        @cd $(LFS)$(SRC) ; tar -xvjf $(1) > /tmp/unpacked
+  @if [ -f $(LFS)$(SRC)/$(1).bz2 ] ; then \
+    cd $(LFS)$(SRC) ; tar -xvjf $(1).bz2 > /tmp/unpacked ; \
+  else \
+    cd $(LFS)$(SRC) ; tar -xvzf $(1).gz > /tmp/unpacked ; \
+  fi ;
+endef
+
+define unpack2
+  @cd $(LFS)$(SRC) ; /tools/bin/tar -xvf $(1) > /tmp/unpacked
 endef
 

jhalfs

@@ -360 +360 @@
     if [ "$vrs" != "" ] ; then
       if [ "$name" = "tcl" ] ; then
-        FILE="$name$vrs-src.tar.bz2"
+        FILE="$name$vrs-src.tar"
       else
-        FILE="$name-$vrs.tar.bz2"
+        FILE="$name-$vrs.tar"
       fi
 
@@ -512 +512 @@
     # Insert instructions for unpacking the package and changing directories
     if [ "$vrs" != "" ] ; then
-      FILE="$name-$vrs.tar.bz2"
+      FILE="$name-$vrs.tar.*"
 (
     cat  << EOF
-        @\$(call unpack,$FILE)
+        @\$(call unpack2,$FILE)
         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
         echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\
@@ -648 +648 @@
       if [[ `_IS_ $i bootscripts` ]] ; then
         vrs=`grep "^lfs-bootscripts-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-        FILE="lfs-bootscripts-$vrs.tar.bz2"
+        FILE="lfs-bootscripts-$vrs.tar.*"
       elif [[ `_IS_ $i kernel` ]] ; then
         vrs=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-        FILE="linux-$vrs.tar.bz2"
+        FILE="linux-$vrs.tar.*"
       fi
 (
     cat  << EOF
-        @\$(call unpack,$FILE)
+        @\$(call unpack2,$FILE)
         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
         echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\