Skip to content

Installation fixes#70

Closed
tpetazzoni wants to merge 3 commits into
raspberrypi:masterfrom
tpetazzoni:installation-fixes
Closed

Installation fixes#70
tpetazzoni wants to merge 3 commits into
raspberrypi:masterfrom
tpetazzoni:installation-fixes

Conversation

@tpetazzoni
Copy link
Copy Markdown

No description provided.

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>
@tpetazzoni
Copy link
Copy Markdown
Author

I've resubmitted this pull request to raspberrypi/usbboot#2, so I'm closing this one.

@tpetazzoni tpetazzoni closed this Dec 5, 2016
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.

1 participant