diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2008-07-23 06:30:29 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2008-07-23 06:30:29 +0000 |
| commit | 2bff8402d4c44c7f3b33e949aef182649f626002 (patch) | |
| tree | 684026e38a3543d22a75a8350ae65841fc6af863 | |
| parent | 0a9c749fbf0dd960d868f3d713dac71c7489bfca (diff) | |
| download | rockbox-2bff8402d4c44c7f3b33e949aef182649f626002.zip rockbox-2bff8402d4c44c7f3b33e949aef182649f626002.tar.gz rockbox-2bff8402d4c44c7f3b33e949aef182649f626002.tar.bz2 rockbox-2bff8402d4c44c7f3b33e949aef182649f626002.tar.xz | |
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
| -rwxr-xr-x | tools/buildzip.pl | 6 | ||||
| -rwxr-xr-x | tools/configure | 2 |
2 files changed, 4 insertions, 4 deletions
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 @@ 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 4307f32..f83f8a8 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 |