diff options
| author | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-21 15:04:24 +0000 |
|---|---|---|
| committer | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-21 15:04:24 +0000 |
| commit | e1e6ec6e2b248129ca1e654e40eca01e5aeb9d75 (patch) | |
| tree | 974c18f372b0cae4ba91d8aea405b5a585b06efe | |
| parent | a1d0cf7a934f7e2810d00fb3deb60f90982b34ce (diff) | |
| download | openwrt-e1e6ec6e2b248129ca1e654e40eca01e5aeb9d75.tar.gz openwrt-e1e6ec6e2b248129ca1e654e40eca01e5aeb9d75.zip | |
AA: backport: "[tools] ipkg-utils: Force gnu format for tar (#12496)"
[backport r34261]
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34827 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | tools/ipkg-utils/patches/200-force_gnu_format.patch | 27 |
1 files changed, 27 insertions, 0 deletions
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 000000000..f363acbc0 --- /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 |