Explorar el Código

kick out remaining compress stuff, too -- we do not benefit from it at all

Ralf S. Engelschall hace 23 años
padre
commit
5bfc05c6ee
Se han modificado 3 ficheros con 11 adiciones y 34 borrados
  1. 9 10
      openpkg/README
  2. 1 23
      openpkg/aux.wrapsrc.sh
  3. 1 1
      openpkg/openpkg.boot

+ 9 - 10
openpkg/README

@@ -125,12 +125,11 @@
   After this procedure, the build root contains the target filesystem
   hierarchy with RPM installed with itself. What is now remaining is to
   roll a bootstrap package with this stuff for initial installation. For
-  this the build root is packed into a tarball, compressed, uuencoded,
-  and finally wrapped into a self-extracting shell script. The result
-  is the binary bootstrap script openpkg-X.X-X.YYYY-YYYYYYY-ZZ.sh
-  which can be used to bootstrap the target hierarchy from
-  scratch. If one later wants to upgrade this hierarchy one uses
-  openpkg-X.X-X.YYYY-YYYYYYY-ZZ.rpm.
+  this the build root is packed into a tarball, uuencoded, and finally
+  wrapped into a self-extracting shell script. The result is the binary
+  bootstrap script openpkg-X.X-X.YYYY-YYYYYYY-ZZ.sh which can be used
+  to bootstrap the target hierarchy from scratch. If one later wants to
+  upgrade this hierarchy one uses openpkg-X.X-X.YYYY-YYYYYYY-ZZ.rpm.
 
   To allow one to easily repeat this from-source bootstrapping procedure
   on other machines, one can run "./openpkg.boot -s" which rolls a
@@ -146,10 +145,10 @@
                     _______ Supported ________
   Operating System  Still    Official Already 
   ----------------- -------- -------- --------
-  FreeBSD           4.[0-4]  4.5      5.0-C
-  Debian GNU/Linux  -        2.2      3.0-pre
-  RedHat Linux      7.[01]   7.2      -
-  Solaris           2.[67]   2.8      2.9
+  FreeBSD           4.[0-6]  4.7      5.0
+  Debian GNU/Linux  2.2      3.0      -
+  RedHat Linux      7.[01]   7.2      8.0
+  Solaris           2.[678]  2.9      -
   ----------------- -------- -------- --------
   NetBSD            1.5.[01] 1.5.2    -
   OpenBSD           -        2.9      -

+ 1 - 23
openpkg/aux.wrapsrc.sh

@@ -74,34 +74,12 @@ if [ ".$cgrp" = . ]; then
     cgrp="$cusr"
 fi
 
-#   determine uncompression tool
-uncompress=""
-for t in uncompress gunzip gzip; do
-    for p in `IFS=":"; echo . $PATH /bin /sbin /usr/bin /usr/sbin`; do
-        if [ -f "$p/$t" ]; then
-            uncompress="$p/$t"
-            if [ ".$t" = .gzip ]; then
-                uncompress="$uncompress -d"
-            fi
-            break
-        fi
-    done
-    if [ ".$uncompress" != . ]; then
-       break
-    fi
-done
-if [ ".$uncompress" = . ]; then
-    echo "$0:FAILED: required uncompress, gunzip or gzip tool not found"
-    exit 1
-fi
-
 #   extract the tarball
 echo "$me: extracting to $dir..."
 uudecode $me
 rm -rf $dir >/dev/null 2>&1
 mkdir $dir || exit 1
-$uncompress <$tgz |\
-(cd $dir; tar x${v}f - 2>/dev/null)
+cat $tgz | (cd $dir; tar x${v}f - 2>/dev/null)
 if [ ".$cusr" = .root ]; then
     ( cd $dir 
       chown -R -h $cusr . >/dev/null 2>&1 || true

+ 1 - 1
openpkg/openpkg.boot

@@ -142,7 +142,7 @@ if [ ".$bs" = .1 ]; then
     rm -f $tmpdir/.sh
     sed <$srcdir/aux.wrapsrc.sh >$pkgdir/$name-$version-$release.src.sh \
         -e "s;@DIR@;$name-$version-$release.src;" -e "s;@TGZ@;$name-$version-$release.src.tar.Z;"
-    (cd $tmpdir && tar cf - *) | compress |\
+    (cd $tmpdir && tar cf - *) |\
     uuencode $name-$version-$release.src.tar.Z |\
         dd bs=64000 2>/dev/null >>$pkgdir/$name-$version-$release.src.sh
     exit 0