From dcdb6e9448f06a9c35bc443d236859b0c357fdc8 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 28 Oct 2019 18:56:47 +0000 Subject: [PATCH 1/4] Add Python3 support --- rpi-eeprom-config | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rpi-eeprom-config b/rpi-eeprom-config index ac34921..c4471a8 100755 --- a/rpi-eeprom-config +++ b/rpi-eeprom-config @@ -75,20 +75,26 @@ class BootloaderImage(object): pad = pad + 1 if self._out is not None: - self._out.write(self._bytes) - self._out.close() + self._out.write(self._bytes) + self._out.close() else: - sys.stdout.write(self._bytes) + if hasattr(sys.stdout, 'buffer'): + sys.stdout.buffer.write(self._bytes) + else: + sys.stdout.write(self._bytes) def read(self): hdr_offset, length = self.find_config() offset = hdr_offset + 4 + FILE_HDR_LEN config_bytes = self._bytes[offset:offset+length-FILENAME_LEN-4] if self._out is not None: - self._out.write(config_bytes) - self._out.close() + self._out.write(config_bytes) + self._out.close() else: - sys.stdout.write(config_bytes) + if hasattr(sys.stdout, 'buffer'): + sys.stdout.buffer.write(config_bytes) + else: + sys.stdout.write(config_bytes) def main(): parser = argparse.ArgumentParser('RPI EEPROM config tool') From bf4849ce3bb3bc80b41bdb14ed09226c9798236e Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Tue, 29 Oct 2019 10:32:21 +0000 Subject: [PATCH 2/4] Remove deprecated EEPROM from test script The test script was failing because the deprecated bootloader EEPROM image was removed. Migrate the test to use a different EEPROM version. --- test/test-rpi-eeprom-config | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/test-rpi-eeprom-config b/test/test-rpi-eeprom-config index f56975a..a2e6045 100755 --- a/test/test-rpi-eeprom-config +++ b/test/test-rpi-eeprom-config @@ -141,20 +141,17 @@ check_conf_size_too_large() fi } -check_loopback "../firmware/critical/pieeprom-2019-05-10.bin" "bootconf-2019-05-10.txt" -cleanup - check_loopback "../firmware/critical/pieeprom-2019-07-15.bin" "bootconf-2019-07-15.txt" cleanup check_update "../firmware/critical/pieeprom-2019-07-15.bin" "pieeprom-2019-07-15-freeze.bin" "bootconf-2019-07-15-freeze.txt" cleanup -check_reduce_size "../firmware/critical/pieeprom-2019-05-10.bin" "bootconf-2019-05-10.txt" +check_reduce_size "../firmware/critical/pieeprom-2019-07-15.bin" "bootconf-2019-07-15.txt" cleanup -check_conf_size_large "../firmware/critical/pieeprom-2019-05-10.bin" +check_conf_size_large "../firmware/critical/pieeprom-2019-07-15.bin" cleanup -check_conf_size_too_large "../firmware/critical/pieeprom-2019-05-10.bin" +check_conf_size_too_large "../firmware/critical/pieeprom-2019-07-15.bin" cleanup From 6895418ffe161ec1b325db8049009364be80dc42 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Tue, 29 Oct 2019 15:16:43 +0100 Subject: [PATCH 3/4] fix typo --- rpi-eeprom-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index 9f5a3de..84f91de 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -282,7 +282,7 @@ rpi-eeprom-update [options]... [FILE] image(s) (pieeprom.upd and vl805.bin) to the boot partition on the sd-card. The SHA256 hash of the corresponding images are written to pieeprom.sig and/or vl805.sig. This guards against file system corruption which could - cause the EEPROM to be flashed with an invalid image. This is is not a + cause the EEPROM to be flashed with an invalid image. This is not a security check. At the next reboot the ROM runs recovery.bin which updates EEPROM(s). From acf47682dba80d273ca4550a3903f8b0c5a60172 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 31 Oct 2019 12:50:32 +0000 Subject: [PATCH 4/4] 2.2-1 release --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5ab243b..ec05b54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +rpi-eeprom (2.2-1) buster; urgency=medium + + [ MilhouseVH ] + * Add Python3 support + + [ Tim Gover ] + * Remove deprecated EEPROM from test script + + [ josef radinger ] + * fix typo + + -- Serge Schneider Thu, 31 Oct 2019 12:50:17 +0000 + rpi-eeprom (2.1-1) buster; urgency=medium [ Tim Gover ]