2
0

120-build_tar.patch 1.2 KB

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