Make 'make tar' and hence 'make gzip' and 'make bzip2' work again (reconfigure if you use one of these).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18116 a1c6a512-1295-4272-9138-f99709370657
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 380a3e4..12348c6 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -47,7 +47,7 @@
$ROOT="..";
-my $ziptool="zip";
+my $ziptool="zip -r";
my $output="rockbox.zip";
my $verbose;
my $exe;
@@ -437,9 +437,9 @@
unlink($output);
if($verbose) {
- print "$ziptool -r $output .rockbox >/dev/null\n";
+ print "$ziptool $output .rockbox >/dev/null\n";
}
- system("$ziptool -r $output .rockbox >/dev/null");
+ system("$ziptool $output .rockbox >/dev/null");
if($target && ($fonts != 1)) {
# On some targets, rockbox.* is inside .rockbox
diff --git a/tools/configure b/tools/configure
index 4307f32..f83f8a8 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2345,7 +2345,7 @@
tar:
\$(SILENT)rm -f rockbox.tar
\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
- \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+ \$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\" -o "rockbox.tar" -z "tar -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
bzip2: tar
\$(SILENT)bzip2 -f9 rockbox.tar