mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 05:38:00 +00:00
Workaround a bug(?) in tar in debian squeeze, which causes the build process to fail without any reason.
SVN-Revision: 16390
This commit is contained in:
parent
1d0e6bc3b1
commit
4063d0c93f
@ -773,7 +773,7 @@ ipkg_install_file_dest() {
|
|||||||
mkdir -p $IPKG_TMP/$pkg/data
|
mkdir -p $IPKG_TMP/$pkg/data
|
||||||
mkdir -p $info_dir
|
mkdir -p $info_dir
|
||||||
|
|
||||||
if ! $pkg_extract_stdout $filename ./control.tar.gz | (cd $IPKG_TMP/$pkg/control; tar -xzf - ) ; then
|
if ! $pkg_extract_stdout $filename ./control.tar.gz | (cd $IPKG_TMP/$pkg/control; zcat | tar -xf - ) ; then
|
||||||
echo "ipkg_install_file: ERROR unpacking control.tar.gz from $filename"
|
echo "ipkg_install_file: ERROR unpacking control.tar.gz from $filename"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -803,7 +803,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg
|
|||||||
set -o noglob
|
set -o noglob
|
||||||
rm -r $IPKG_TMP/$pkg/control
|
rm -r $IPKG_TMP/$pkg/control
|
||||||
|
|
||||||
if ! $pkg_extract_stdout $filename ./data.tar.gz | (cd $IPKG_TMP/$pkg/data; tar -xzf - ) ; then
|
if ! $pkg_extract_stdout $filename ./data.tar.gz | (cd $IPKG_TMP/$pkg/data; zcat | tar -xf - ) ; then
|
||||||
echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename"
|
echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
@ -875,7 +875,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
|
|||||||
rm -rf $IPKG_TMP/$pkg/data
|
rm -rf $IPKG_TMP/$pkg/data
|
||||||
rmdir $IPKG_TMP/$pkg
|
rmdir $IPKG_TMP/$pkg
|
||||||
rm -f $info_dir/$pkg.list
|
rm -f $info_dir/$pkg.list
|
||||||
$pkg_extract_stdout $filename ./data.tar.gz | tar tzf - | sed -e 's/^\.//' > $info_dir/$pkg.list
|
$pkg_extract_stdout $filename ./data.tar.gz | zcat | tar tf - | sed -e 's/^\.//' > $info_dir/$pkg.list
|
||||||
|
|
||||||
if [ -x "$info_dir/$pkg.postinst" ]; then
|
if [ -x "$info_dir/$pkg.postinst" ]; then
|
||||||
$info_dir/$pkg.postinst configure
|
$info_dir/$pkg.postinst configure
|
||||||
|
Loading…
Reference in New Issue
Block a user