diff options
Diffstat (limited to 'tools/ipkg-utils/patches/120-build_tar.patch')
| -rw-r--r-- | tools/ipkg-utils/patches/120-build_tar.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/tools/ipkg-utils/patches/120-build_tar.patch b/tools/ipkg-utils/patches/120-build_tar.patch new file mode 100644 index 000000000..acf6b7985 --- /dev/null +++ b/tools/ipkg-utils/patches/120-build_tar.patch @@ -0,0 +1,36 @@ +This patch from aorlinsk fixes an issue with order in options passed to tar + + http://openwrt.org/forum/viewtopic.php?pid=8332#p8332 + + +--- a/ipkg-build ++++ b/ipkg-build +@@ -184,7 +184,7 @@ while getopts "cg:ho:v" opt; do + g ) group=$OPTARG + ogargs="$ogargs --group=$group" + ;; +- c ) outer=tar ++ c ) outer=$TAR + ;; + C ) noclean=1 + ;; +@@ -243,8 +243,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$ + mkdir $tmp_dir + + echo $CONTROL > $tmp_dir/tarX +-( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX ) +-( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . ) ++( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . ) ++( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . ) + rm $tmp_dir/tarX + + echo "2.0" > $tmp_dir/debian-binary +@@ -254,7 +254,7 @@ rm -f $pkg_file + if [ "$outer" = "ar" ] ; then + ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) + else +- ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) ++ ( cd $tmp_dir && $TAR -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) + fi + + rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz |