tools/ipkg-utils/patches/140-portability.patch

   1 diff -ur ipkg.old/ipkg-build ipkg.dev/ipkg-build
   2 --- ipkg.old/ipkg-build Tue Oct 10 22:52:58 2006
   3 +++ ipkg.dev/ipkg-build Tue Oct 10 22:56:32 2006
   4 @@ -11,6 +11,8 @@
   5
   6  version=1.0
   7
   8 +TAR="${TAR:-$(which tar)}"
   9 +
  10  ipkg_extract_value() {
  11         sed -e "s/^[^:]*:[[:space:]]*//"
  12  }
  13 @@ -184,7 +186,7 @@
  14         g ) group=$OPTARG
  15             ogargs="$ogargs --group=$group"
  16             ;;
  17 -        c ) outer=tar
  18 +        c ) outer=$TAR
  19              ;;
  20          C ) noclean=1
  21              ;;
  22 @@ -243,8 +245,8 @@
  23  mkdir $tmp_dir
  24
  25  echo $CONTROL > $tmp_dir/tarX
  26 -( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
  27 -( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
  28 +( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
  29 +( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . )
  30  rm $tmp_dir/tarX
  31
  32  echo "2.0" > $tmp_dir/debian-binary
  33 @@ -254,7 +256,7 @@
  34  if [ "$outer" = "ar" ] ; then
  35    ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
  36  else
  37 -  ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
  38 +  ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
  39  fi
  40
  41  rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
  42 diff -ur ipkg.old/ipkg-make-index ipkg.dev/ipkg-make-index
  43 --- ipkg.old/ipkg-make-index    Tue Oct 10 22:52:58 2006
  44 +++ ipkg.dev/ipkg-make-index    Tue Oct 10 22:57:53 2006
  45 @@ -1,4 +1,4 @@
  46 -#!/usr/bin/python
  47 +#!/usr/bin/env python
  48  # $Id: ipkg-make-index,v 1.20 2003/10/30 02:32:09 jamey Exp $
  49
  50  import sys, os, posixpath