Installation fixes #2
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This might be needed to pass some custom CFLAGS/LDFLAGS when building rpiboot. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This allows installing rpiboot outside of /usr if needed. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
The current logic to find def1, def2 and def3 first tries to find them in the local directory, and if they are not available, find them in /usr/share. However, this doesn't work if rpiboot and its related files are installed, but not in /usr. In order to address this use-case, this commit reworks the logic to find the file path. A new function, getfilepath() is created. If the requested file is available in the current directory, it is used. If not, then the path to the file is inferred from the location of the currently running program. I.e if we run /home/foo/sys/bin/rpiboot, then we will search def1 in usbbootcode.bin in /home/foo/sys/bin/../share/rpiboot/usbbootcode.bin. This continues to address the case of an installation in /usr, while allowing installation in other locations as well. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
Thanks for this, for the latest version of rpiboot I've actually removed the ability to install it to /usr/bin etc. Of course this does mean people could accidentally leave behind an old version of the binaries which would be annoying so I've left uninstall around. Not sure what the right way to do this is, be happy with a different PR if you think there's a cleaner way of doing it... |
airtower-luna
pushed a commit
to airtower-luna/raspberrypi-usbboot
that referenced
this pull request
Nov 7, 2024
This might be needed to pass some custom CFLAGS/LDFLAGS when building rpiboot. Submitted-upstream: raspberrypi#2 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> [Rebased on 9324fd7] Signed-off-by: Peter Seiderer <ps.report@gmx.net> [Rebased on 20240926-102326-0-g82d8755] Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
timg236
pushed a commit
that referenced
this pull request
Nov 7, 2024
This might be needed to pass some custom CFLAGS/LDFLAGS when building rpiboot. Submitted-upstream: #2 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> [Rebased on 9324fd7] Signed-off-by: Peter Seiderer <ps.report@gmx.net> [Rebased on 20240926-102326-0-g82d8755] Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.