Skip to content

Commit c0a4645

Browse files
committed
Fix the error message for config signing
When the user runs rpi-eeprom-config to sign a bootloader image, if the image is not the correct size, the error message returns a tautology: rpi-eeprom-config -c boot.conf -p /tmp/rpi-pubkey.pem \ -o pieeprom.upd /tmp/downloaded-boot.img ERROR: /tmp/downloaded-boot.img: \ Expected size 62914560 bytes actual size 62914560 bytes When it should be alerting the user that there are only two valid values for a bootloader size. My MR addresses this issue by returning the acceptable values for the bootloader size in the image. ./rpi-eeprom-config -c boot.conf -p /tmp/rpi-pubkey.pem \ -o pieeprom.upd /tmp/downloaded-boot.img ERROR: /tmp/downloaded-boot.img: \ Expected sizes [524288, 2097152] bytes, got actual size 62914560 bytes Signed-off-by: Lincoln Thurlow <[email protected]>
1 parent c6a7555 commit c0a4645

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rpi-eeprom-config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ class BootloaderImage(object):
260260

261261
self._image_size = len(self._bytes)
262262
if self._image_size not in VALID_IMAGE_SIZES:
263-
exit_error("%s: Expected size %d bytes actual size %d bytes" %
264-
(filename, self._image_size, len(self._bytes)))
263+
exit_error("%s: Expected sizes %s bytes, got actual size %d bytes" %
264+
(filename, VALID_IMAGE_SIZES, self._image_size))
265265
self.parse()
266266

267267
def parse(self):

0 commit comments

Comments
 (0)