From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Mon, 19 Nov 2012 19:29:01 +0000 (+0000)
Subject: ipkg-utils: Force gnu format for tar (#12496)
X-Git-Tag: reboot~12253
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=41b66620019c5eef1ee30dfd29cd29a1349232ac;p=openwrt%2Fstaging%2Fchunkeey.git

ipkg-utils: Force gnu format for tar (#12496)

SVN-Revision: 34261
---

diff --git a/tools/ipkg-utils/patches/200-force_gnu_format.patch b/tools/ipkg-utils/patches/200-force_gnu_format.patch
new file mode 100644
index 0000000000..f363acbc0d
--- /dev/null
+++ b/tools/ipkg-utils/patches/200-force_gnu_format.patch
@@ -0,0 +1,27 @@
+--- a/ipkg-build
++++ b/ipkg-build
+@@ -250,13 +250,13 @@ mkdir $tmp_dir
+ 
+ echo $CONTROL > $tmp_dir/tarX
+ # Preserve permissions (-p) when creating data.tar.gz as non-root user
+-( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX -czpf $tmp_dir/data.tar.gz . )
++( cd $pkg_dir && $TAR $ogargs -X $tmp_dir/tarX --format=gnu -czpf $tmp_dir/data.tar.gz . )
+ 
+ installed_size=`stat -c "%s" $tmp_dir/data.tar.gz`
+ sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
+ 	$pkg_dir/$CONTROL/control
+ 
+-( cd $pkg_dir/$CONTROL && $TAR $ogargs -czf $tmp_dir/control.tar.gz . )
++( cd $pkg_dir/$CONTROL && $TAR $ogargs --format=gnu -czf $tmp_dir/control.tar.gz . )
+ rm $tmp_dir/tarX
+ 
+ echo "2.0" > $tmp_dir/debian-binary
+@@ -266,7 +266,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 --format=gnu -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