mirror of
https://github.com/raspberrypi/rpi-eeprom.git
synced 2026-01-20 21:13:36 +08:00
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 <lincoln@isi.edu>
This commit is contained in:
committed by
Tim Gover
parent
c6a755543e
commit
1c92bb9bc3
@@ -260,8 +260,8 @@ class BootloaderImage(object):
|
|||||||
|
|
||||||
self._image_size = len(self._bytes)
|
self._image_size = len(self._bytes)
|
||||||
if self._image_size not in VALID_IMAGE_SIZES:
|
if self._image_size not in VALID_IMAGE_SIZES:
|
||||||
exit_error("%s: Expected size %d bytes actual size %d bytes" %
|
exit_error("%s: Expected sizes %s bytes, got actual size %d bytes" %
|
||||||
(filename, self._image_size, len(self._bytes)))
|
(filename, VALID_IMAGE_SIZES, self._image_size))
|
||||||
self.parse()
|
self.parse()
|
||||||
|
|
||||||
def parse(self):
|
def parse(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user