mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-18 15:51:52 +02:00
4ca144deb8
lua, mtd-utils, ipkg-utils, squashfs, lzma, and autoconf are touched git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14589 3c298f89-4303-0410-b956-a3cf2f4a3e73
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
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
|