tools/ipkg-utils/patches/120-build_tar.patch

   1 This patch from aorlinsk fixes an issue with order in options passed to tar
   2
   3   http://openwrt.org/forum/viewtopic.php?pid=8332#p8332
   4
   5
   6 --- a/ipkg-build
   7 +++ b/ipkg-build
   8 @@ -184,7 +184,7 @@ while getopts "cg:ho:v" opt; do
   9         g ) group=$OPTARG
  10             ogargs="$ogargs --group=$group"
  11             ;;
  12 -        c ) outer=tar
  13 +        c ) outer=$TAR
  14              ;;
  15          C ) noclean=1
  16              ;;
  17 @@ -243,8 +243,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
  18  mkdir $tmp_dir
  19
  20  echo $CONTROL > $tmp_dir/tarX
  21 -( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX )
  22 -( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
  23 +( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
  24 +( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . )
  25  rm $tmp_dir/tarX
  26
  27  echo "2.0" > $tmp_dir/debian-binary
  28 @@ -254,7 +254,7 @@ rm -f $pkg_file
  29  if [ "$outer" = "ar" ] ; then
  30    ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
  31  else
  32 -  ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
  33 +  ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
  34  fi
  35
  36  rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz