summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-07-23 06:30:29 +0000
committerJens Arnold <amiconn@rockbox.org>2008-07-23 06:30:29 +0000
commit2bff8402d4c44c7f3b33e949aef182649f626002 (patch)
tree684026e38a3543d22a75a8350ae65841fc6af863 /tools
parent0a9c749fbf0dd960d868f3d713dac71c7489bfca (diff)
downloadrockbox-2bff8402d4c44c7f3b33e949aef182649f626002.tar.gz
rockbox-2bff8402d4c44c7f3b33e949aef182649f626002.tar.bz2
rockbox-2bff8402d4c44c7f3b33e949aef182649f626002.zip
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildzip.pl6
-rwxr-xr-xtools/configure2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 380a3e407f..12348c61d5 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -47,7 +47,7 @@ sub find_copyfile {
$ROOT="..";
-my $ziptool="zip";
+my $ziptool="zip -r";
my $output="rockbox.zip";
my $verbose;
my $exe;
@@ -437,9 +437,9 @@ sub runone {
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 4307f32b2d..f83f8a815f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2345,7 +2345,7 @@ fullzip:
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