OpenSystemsDevelopment / usbboot

Commit 92657b0e5eba807e802d356f0a18d77f0d2e442e

Authored by Tim Gover
Committed by Phil Elwell
1 parent 9c629d87

Update packaging for win32/debian installers 

Include the new imager applications and fix the recursive File
operations to stop the installer pulling in the .git directory.
Inline Side-by-side
Showing 2 changed files with 45 additions and 7 deletions
debian/rpiboot.install
  View file @92657b0
@@ -7,6 +7,14 @@ msd/*.bin usr/share/rpiboot/msd/ @@ -7,6 +7,14 @@ msd/*.bin usr/share/rpiboot/msd/
7 recovery/*.bin usr/share/rpiboot/recovery/ 7 recovery/*.bin usr/share/rpiboot/recovery/
8 recovery/*.sig usr/share/rpiboot/recovery/ 8 recovery/*.sig usr/share/rpiboot/recovery/
9 recovery/*.txt usr/share/rpiboot/recovery/ 9 recovery/*.txt usr/share/rpiboot/recovery/
  10 +rpi-imager-embedded/*.bin usr/share/rpiboot/rpi-imager-embedded/
  11 +rpi-imager-embedded/*.img usr/share/rpiboot/rpi-imager-embedded/
  12 +rpi-imager-embedded/*.md usr/share/rpiboot/rpi-imager-embedded/
  13 +rpi-imager-embedded/*.txt usr/share/rpiboot/rpi-imager-embedded/
  14 +mass-storage-gadget/*.bin usr/share/rpiboot/mass-storage-gadget/
  15 +mass-storage-gadget/*.img usr/share/rpiboot/mass-storage-gadget/
  16 +mass-storage-gadget/*.md usr/share/rpiboot/mass-storage-gadget/
  17 +mass-storage-gadget/*.txt usr/share/rpiboot/mass-storage-gadget/
10 secure-boot-recovery/*.txt usr/share/rpiboot/secure-boot-recovery/ 18 secure-boot-recovery/*.txt usr/share/rpiboot/secure-boot-recovery/
11 secure-boot-recovery/*.conf usr/share/rpiboot/secure-boot-recovery/ 19 secure-boot-recovery/*.conf usr/share/rpiboot/secure-boot-recovery/
12 secure-boot-recovery/*.md usr/share/rpiboot/secure-boot-recovery/ 20 secure-boot-recovery/*.md usr/share/rpiboot/secure-boot-recovery/
@@ -14,5 +22,10 @@ secure-boot-recovery/*.bin usr/share/rpiboot/secure-boot-recovery/ @@ -14,5 +22,10 @@ secure-boot-recovery/*.bin usr/share/rpiboot/secure-boot-recovery/
14 secure-boot-msd/*.bin usr/share/rpiboot/secure-boot-msd/ 22 secure-boot-msd/*.bin usr/share/rpiboot/secure-boot-msd/
15 secure-boot-msd/*.img usr/share/rpiboot/secure-boot-msd/ 23 secure-boot-msd/*.img usr/share/rpiboot/secure-boot-msd/
16 secure-boot-msd/*.md usr/share/rpiboot/secure-boot-msd/ 24 secure-boot-msd/*.md usr/share/rpiboot/secure-boot-msd/
  25 +secure-boot-msd/*.txt usr/share/rpiboot/secure-boot-msd/
  26 +secure-boot-example/*.bin usr/share/rpiboot/secure-boot-example/
  27 +secure-boot-example/*.img usr/share/rpiboot/secure-boot-example/
  28 +secure-boot-example/*.md usr/share/rpiboot/secure-boot-example/
  29 +secure-boot-example/*.txt usr/share/rpiboot/secure-boot-example/
17 tools/* usr/share/rpiboot/tools/ 30 tools/* usr/share/rpiboot/tools/
18 debian/70-rpiboot.rules /lib/udev/rules.d 31 debian/70-rpiboot.rules /lib/udev/rules.d
win32/install_script.nsi
  View file @92657b0
@@ -92,14 +92,33 @@ FunctionEnd @@ -92,14 +92,33 @@ FunctionEnd
92 Section "Raspberry Pi USB Boot" Sec_rpiboot 92 Section "Raspberry Pi USB Boot" Sec_rpiboot
93 93
94 SetOutPath "$INSTDIR" 94 SetOutPath "$INSTDIR"
95 -  
96 File /r redist 95 File /r redist
97 - File /r ..\msd  
98 - File /r ..\recovery  
99 - File /r ..\secure-boot-recovery  
100 - File /r ..\secure-boot-msd  
101 - File /r ..\tools 96 +
  97 + SetOutPath "$INSTDIR\msd"
  98 + File /r ..\msd\*.*
  99 +
  100 + SetOutPath "$INSTDIR\recovery"
  101 + File /r ..\recovery\*.*
  102 +
  103 + SetOutPath "$INSTDIR\mass-storage-gadget"
  104 + File /r ..\mass-storage-gadget\*.*
  105 +
  106 + SetOutPath "$INSTDIR\rpi-imager-embedded"
  107 + File /r ..\rpi-imager-embedded\*.*
  108 +
  109 + SetOutPath "$INSTDIR\secure-boot-example"
  110 + File /r ..\secure-boot-example\*.*
  111 +
  112 + SetOutPath "$INSTDIR\secure-boot-msd"
  113 + File /r ..\secure-boot-msd\*.*
  114 +
  115 + SetOutPath "$INSTDIR\secure-boot-recovery"
  116 + File /r ..\secure-boot-recovery\*.*
  117 +
  118 + SetOutPath "$INSTDIR\tools"
  119 + File /r ..\tools\*.*
102 120
  121 + SetOutPath "$INSTDIR"
103 DetailPrint "Installing BCM2708 driver..." 122 DetailPrint "Installing BCM2708 driver..."
104 ExecWait '"$INSTDIR\redist\wdi-simple.exe" -n "Raspberry Pi USB boot" -v 0x0a5c -p 0x2763 -t 0' $0 123 ExecWait '"$INSTDIR\redist\wdi-simple.exe" -n "Raspberry Pi USB boot" -v 0x0a5c -p 0x2763 -t 0' $0
105 DetailPrint "Driver install returned $0" 124 DetailPrint "Driver install returned $0"
@@ -111,7 +130,7 @@ Section "Raspberry Pi USB Boot" Sec_rpiboot @@ -111,7 +130,7 @@ Section "Raspberry Pi USB Boot" Sec_rpiboot
111 DetailPrint "Installing BCM2711 driver..." 130 DetailPrint "Installing BCM2711 driver..."
112 ExecWait '"$INSTDIR\redist\wdi-simple.exe" -n "Raspberry Pi USB boot" -v 0x0a5c -p 0x2711 -t 0' $0 131 ExecWait '"$INSTDIR\redist\wdi-simple.exe" -n "Raspberry Pi USB boot" -v 0x0a5c -p 0x2711 -t 0' $0
113 DetailPrint "Driver install returned $0" 132 DetailPrint "Driver install returned $0"
114 - 133 +
115 File cyggcc_s-1.dll 134 File cyggcc_s-1.dll
116 File cygusb-1.0.dll 135 File cygusb-1.0.dll
117 File cygwin1.dll 136 File cygwin1.dll
@@ -146,8 +165,14 @@ SectionEnd @@ -146,8 +165,14 @@ SectionEnd
146 Section "Uninstall" 165 Section "Uninstall"
147 166
148 RmDir /r /REBOOTOK $INSTDIR\redist 167 RmDir /r /REBOOTOK $INSTDIR\redist
  168 + RmDir /r /REBOOTOK $INSTDIR\mass-storage-gadget
149 RmDir /r /REBOOTOK $INSTDIR\msd 169 RmDir /r /REBOOTOK $INSTDIR\msd
150 RmDir /r /REBOOTOK $INSTDIR\recovery 170 RmDir /r /REBOOTOK $INSTDIR\recovery
  171 + RmDir /r /REBOOTOK $INSTDIR\rpi-imager-embedded
  172 + RmDir /r /REBOOTOK $INSTDIR\secure-boot-example
  173 + RmDir /r /REBOOTOK $INSTDIR\secure-boot-msd
  174 + RmDir /r /REBOOTOK $INSTDIR\secure-boot-recovery
  175 + RmDir /r /REBOOTOK $INSTDIR\tools
151 RmDir /r /REBOOTOK $INSTDIR\usb_driver 176 RmDir /r /REBOOTOK $INSTDIR\usb_driver
152 177
153 Delete $INSTDIR\Uninstall.exe 178 Delete $INSTDIR\Uninstall.exe