Skip to content

Add fallback for mass-storage-gadget64 path - #405

Merged
timg236 merged 2 commits into
raspberrypi:masterfrom
nbuchwitz:devel/rpiboot-lookup
Oct 16, 2026
Merged

timg236 merged 2 commits into
raspberrypi:masterfrom
nbuchwitz:devel/rpiboot-lookup

Conversation

@nbuchwitz

Copy link
Copy Markdown
Contributor

We keep getting reports from customers that rpiboot "doesn't work". Most of the time they built it themselves and run it from outside the project folder, so rpiboot can't find the boot files in the install prefix or the current directory.

So maybe we can improve the UX and have a second fallback that also looks for mass-storage-gadget64 next to the rpiboot binary. I also fixed the default path in the README while I was at it. It said INSTALL_PREFIX/share/mass-storage-gadget64.

The install target places the boot files under share/rpiboot.

Signed-off-by: Nicolai Buchwitz <n.buchwitz@kunbus.com>
Running an uninstalled build from outside the source tree fails
because neither the install prefix nor the current directory holds
the boot files. Fall back to the directory containing the rpiboot
executable.

Signed-off-by: Nicolai Buchwitz <n.buchwitz@kunbus.com>
@timg236

timg236 commented Oct 16, 2026

Copy link
Copy Markdown
Collaborator

Looks reasonable, I'll merge it untested (by me) since I know you will have tested it :)

@timg236
timg236 merged commit 0fd2663 into raspberrypi:master Oct 16, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants