Merge pull request #47 from XECDesign/debian/buster

Debian/buster

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 <serge@raspberrypi.org>  Thu, 31 Oct 2019 12:50:17 +0000
+
 rpi-eeprom (2.1-1) buster; urgency=medium
 
   [ Tim Gover ]

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')

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). 

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