Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#9567 - Add support for configurable root directory for Rockbox firmware

Attached to Project: Rockbox
Opened by Alex Bennee (ajb) - Friday, 21 November 2008, 09:57 GMT+2
Last edited by Björn Stenberg (zagor) - Monday, 24 November 2008, 23:16 GMT+2
Task Type Patches
Category Build environment
Status Closed
Assigned To No-one
Player Type All players
Severity Low
Priority Normal
Reported Version Daily build (which?)
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

The Rockbox file browser has the ability to load new firmware by selecting an alternative rockbox.ipod. However this is rather pointless as the support files in "/.rockbox" will be for the old build.

This series of patches allow you to configure rockbox with an alternate directory:

../tools/configure --target=22 --ram=64 --type=N --rbdir=rockboxdev.alt

Which after building will give you a complete install zip file which extracts into "rockboxdev.alt". Although this build will never be the primary build (the bootloader is hardwired for .rockbox) it does mean you can run a development build without having to break your existing working setup.
   0001-Make-.rockbox-a-configurable-path.patch (3.1 KiB) 
 b/apps/settings.h |    9 +++++++--
 b/tools/configure |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

   0002-Added-some-verbosity-to-help-follow-how-the-... (2.2 KiB) 
 b/tools/buildzip.pl |   31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

   0003-Parameterize-rockbox-root-so-.rockbox-can-be... (11.2 KiB) 
 b/tools/buildzip.pl |  117 ++++++++++++++++++++++++++--------------------------
 1 file changed, 60 insertions(+), 57 deletions(-)

   0004-Clean-up-wpsbuild-with-some-perl-love.-Allow... (8.3 KiB) 
 b/tools/buildzip.pl |   15 +++++--
 b/wps/wpsbuild.pl   |  106 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 80 insertions(+), 41 deletions(-)

   0005-Plumb-the-rockboxroot-into-the-Makefile-kick... (3.5 KiB) 
 b/tools/configure |    6 ++++--
 b/tools/root.make |   10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

This task depends upon

Closed by  Björn Stenberg (zagor)
Monday, 24 November 2008, 23:16 GMT+2
Reason for closing:  Accepted
Comment by Björn Stenberg (zagor) - Friday, 21 November 2008, 11:21 GMT+2
Looks fine to me. But can you please upload a single patch done with "svn diff" in the rockbox root, instead of the five different files we have here?
Comment by Alex Bennee (ajb) - Friday, 21 November 2008, 11:56 GMT+2
Here is the patch in one big file from SVN diff.

I uploaded multiple patches more as an aid to reviewers so I could "show the working" and the comments for each change.

If people prefer reviewing monolithic patches I can just stick with a whole diff for each tracker entry or submit both a series and an "all" patch.
I don't mind applying the patch to a local SVN to generate the diff but git-diff patches should easily apply with "patch -p1 < git-diff.patch".
As you can probably tell I do all my work in a git-svn repo so I can do things in nice bi-sectable discreet steps.
   configurable_root.patch (24.1 KiB) 
 tools/configure   |   20 ++++++
 tools/buildzip.pl |  161 +++++++++++++++++++++++++++++-------------------------
 tools/root.make   |   10 +--
 apps/settings.h   |    9 ++-
 wps/wpsbuild.pl   |  106 +++++++++++++++++++++++------------
 5 files changed, 189 insertions(+), 117 deletions(-)

Comment by Björn Stenberg (zagor) - Friday, 21 November 2008, 12:20 GMT+2
Generally we prefer single "monolithic" patches.

And yes, a git patch should probably work just as well.
Comment by Robert Keevil (obo) - Friday, 21 November 2008, 14:44 GMT+2
Would it be worth at the same time fixing up the few locations in the source outside of the bootloader where ".rockbox" is still hardcoded?
e.g.:
firmware/include/dircache.h:31
firmware/common/unicode.c:21
firmware/export/font.h:53
Comment by Alex Bennee (ajb) - Friday, 21 November 2008, 17:00 GMT+2
I'll have a look. I wasn't sure which bits where the bootloader and which the actual firmware.
Comment by Alex Bennee (ajb) - Friday, 21 November 2008, 17:40 GMT+2
I think I have them all ignoring all the BOOTDIR stuff (for bootcode?) and changes to the manuals (not relevant for user builds?)
Comment by Alex Bennee (ajb) - Friday, 21 November 2008, 17:41 GMT+2
with the file this time.
   configurable_root_v2.patch (25.6 KiB) 
 b/apps/settings.h             |    9 +-
 b/firmware/common/unicode.c   |    2 
 b/firmware/export/font.h      |    2 
 b/firmware/include/dircache.h |    3 
 b/tools/buildzip.pl           |  161 ++++++++++++++++++++++--------------------
 b/tools/configure             |   20 +++++
 b/tools/root.make             |   10 +-
 b/wps/wpsbuild.pl             |  106 ++++++++++++++++++---------
 8 files changed, 192 insertions(+), 121 deletions(-)

Loading...