OpenSystemsDevelopment / usbboot

Commit 94c872753e617f4a82bdbc6fa2c344a5268ba283

Authored by Serge Schneider
1 parent 95e9e058

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

Add lintian overrides
Inline Side-by-side
Showing 5 changed files with 16 additions and 3 deletions
debian/changelog
  View file @94c8727
  1 +rpiboot (20170926+2) stretch; urgency=medium
  2 +
  3 + * Change rpiboot behaviour to check /usr/share/rpiboot/msd
  4 + * Add lintian-overrides
  5 +
  6 + -- Serge Schneider <serge@raspberrypi.org> Tue, 26 Sep 2017 16:11:13 +0100
  7 +
1 rpiboot (20170926+1) stretch; urgency=medium 8 rpiboot (20170926+1) stretch; urgency=medium
2 9
3 * Install msd files without creating a subdirectory 10 * Install msd files without creating a subdirectory
debian/rpiboot.install
  View file @94c8727
1 rpiboot usr/bin 1 rpiboot usr/bin
2 -msd/* usr/share/rpiboot 2 +msd usr/share/rpiboot
debian/rpiboot.lintian-overrides 0 → 100644
  View file @94c8727
  1 +rpiboot: binary-without-manpage usr/bin/rpiboot
  2 +rpiboot: arch-dependent-file-in-usr-share usr/share/rpiboot/msd/start.elf
  3 +rpiboot: binary-from-other-architecture usr/share/rpiboot/msd/start.elf
  4 +rpiboot: unstripped-binary-or-object usr/share/rpiboot/msd/start.elf
  5 +rpiboot: statically-linked-binary usr/share/rpiboot/msd/start.elf
debian/source.lintian-overrides 0 → 100644
  View file @94c8727
  1 +rpiboot: source-is-missing msd/start.elf
@@ -296,7 +296,7 @@ FILE * check_file(char * dir, char *fname) @@ -296,7 +296,7 @@ FILE * check_file(char * dir, char *fname)
296 296
297 if(fp == NULL) 297 if(fp == NULL)
298 { 298 {
299 - strcpy(path, "/usr/share/rpiboot/"); 299 + strcpy(path, "/usr/share/rpiboot/msd/");
300 strcat(path, fname); 300 strcat(path, fname);
301 fp = fopen(path, "rb"); 301 fp = fopen(path, "rb");
302 } 302 }
@@ -456,7 +456,7 @@ int main(int argc, char *argv[]) @@ -456,7 +456,7 @@ int main(int argc, char *argv[])
456 second_stage = check_file(directory, "bootcode.bin"); 456 second_stage = check_file(directory, "bootcode.bin");
457 if(second_stage == NULL) 457 if(second_stage == NULL)
458 { 458 {
459 - fprintf(stderr, "Unable to open 'bootcode.bin' from /usr/share/rpiboot or supplied directory\n"); 459 + fprintf(stderr, "Unable to open 'bootcode.bin' from /usr/share/rpiboot/msd or supplied directory\n");
460 usage(1); 460 usage(1);
461 } 461 }
462 462