Browse Source

ipkg: fix cpio usage

Waldemar Brodkorb 4 years ago
parent
commit
bdacdf55bf
2 changed files with 5 additions and 7 deletions
  1. 2 2
      scripts/ipkg
  2. 3 5
      scripts/ipkg-build

+ 2 - 2
scripts/ipkg

@@ -808,7 +808,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg
 	set -o noglob
 	rm -r $IPKG_TMP/$pkg/control
 
-	if ! $pkg_extract_stdout $filename ./data.tar.gz|gzip -dc|(cd $IPKG_TMP/$pkg/data && $BIN_DIR/cpio -iud -H ustar) ; then
+	if ! $pkg_extract_stdout $filename ./data.tar.gz|gzip -dc|(cd $IPKG_TMP/$pkg/data && cpio --quiet -iud -H ustar) ; then
 		echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename"
 		return 1
 	fi
@@ -876,7 +876,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
 	fi
 
 	local owd="`pwd`"
-	(cd $IPKG_TMP/$pkg/data/; find . | $BIN_DIR/cpio -o -H ustar | (cd $owd; cd $dest; $BIN_DIR/cpio -iud -H ustar))
+	(cd $IPKG_TMP/$pkg/data/; find . | cpio --quiet -o -H ustar | (cd $owd; cd $dest; cpio --quiet -iud -H ustar))
 	rm -rf $IPKG_TMP/$pkg/data
 	rmdir $IPKG_TMP/$pkg
 	rm -f $info_dir/$pkg.list

+ 3 - 5
scripts/ipkg-build

@@ -206,17 +206,15 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
 mkdir $tmp_dir
 
 ( cd $pkg_dir && find . | grep -v $CONTROL | \
-	sed "s#\(.*\)#:0:0::::::\1#" | \
-	sort | cpio -o -Hustar -P | gzip -n9 > $tmp_dir/data.tar.gz )
+	sort | cpio --quiet -o -Hustar | gzip -n9 > $tmp_dir/data.tar.gz )
 
 ( cd $pkg_dir/$CONTROL && find . | \
-	sed "s#\(.*\)#:0:0::::::\1#" | \
-	sort | cpio -o -Hustar -P | gzip -n9 > $tmp_dir/control.tar.gz )
+	sort | cpio --quiet -o -Hustar | gzip -n9 > $tmp_dir/control.tar.gz )
 
 echo "2.0" > $tmp_dir/debian-binary
 pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
 rm -f $pkg_file
-( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
+( cd $tmp_dir && tar -czf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
 rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
 rmdir $tmp_dir
 echo "Packaged contents of $pkg_dir into $pkg_file"