DeforaNetworks/usbboot
DeforaNetworks/usbboot
3
0
Fork 0
Code Releases Activity

Change rpiboot behaviour to check /usr/share/rpiboot/msd

Browse Source 
Add lintian overrides
This commit is contained in:
Serge Schneider 2017-09-26 16:12:55 +01:00
parent 95e9e05808
commit 94c872753e
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
rpiboot (20170926+2) stretch; urgency=medium
* Change rpiboot behaviour to check /usr/share/rpiboot/msd
* Add lintian-overrides
-- Serge Schneider <serge@raspberrypi.org> Tue, 26 Sep 2017 16:11:13 +0100
rpiboot (20170926+1) stretch; urgency=medium rpiboot (20170926+1) stretch; urgency=medium
* Install msd files without creating a subdirectory * Install msd files without creating a subdirectory

2
debian/rpiboot.install vendored
View File

@ -1,2 +1,2 @@
rpiboot usr/bin rpiboot usr/bin
msd/* usr/share/rpiboot msd usr/share/rpiboot

5
debian/rpiboot.lintian-overrides vendored Normal file
View File

@ -0,0 +1,5 @@
rpiboot: binary-without-manpage usr/bin/rpiboot
rpiboot: arch-dependent-file-in-usr-share usr/share/rpiboot/msd/start.elf
rpiboot: binary-from-other-architecture usr/share/rpiboot/msd/start.elf
rpiboot: unstripped-binary-or-object usr/share/rpiboot/msd/start.elf
rpiboot: statically-linked-binary usr/share/rpiboot/msd/start.elf

1
debian/source.lintian-overrides vendored Normal file
View File

@ -0,0 +1 @@
rpiboot: source-is-missing msd/start.elf

4
main.c
View File

@ -296,7 +296,7 @@ FILE * check_file(char * dir, char *fname)
if(fp == NULL) if(fp == NULL)
{ {
strcpy(path, "/usr/share/rpiboot/"); strcpy(path, "/usr/share/rpiboot/msd/");
strcat(path, fname); strcat(path, fname);
fp = fopen(path, "rb"); fp = fopen(path, "rb");
} }
@ -456,7 +456,7 @@ int main(int argc, char *argv[])
second_stage = check_file(directory, "bootcode.bin"); second_stage = check_file(directory, "bootcode.bin");
if(second_stage == NULL) if(second_stage == NULL)
{ {
fprintf(stderr, "Unable to open 'bootcode.bin' from /usr/share/rpiboot or supplied directory\n"); fprintf(stderr, "Unable to open 'bootcode.bin' from /usr/share/rpiboot/msd or supplied directory\n");
usage(1); usage(1);
} }