raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-21 06:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #234 from XECDesign/debian/buster

Browse Source 
Debian/buster
This commit is contained in:
Tim Gover
2020-10-06 10:53:30 +01:00
committed by GitHub
parent 4f6587ce48 1c6e9ab50a
commit 9e929e4389
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
rpi-eeprom (10.1-1) buster; urgency=medium
[ Tim Gover ]
* rpi-eeprom-config: Use decode('utf-8') to convert subprocess txt
-- Serge Schneider <serge@raspberrypi.com> Tue, 06 Oct 2020 10:45:07 +0100
rpi-eeprom (10.0-1) buster; urgency=medium rpi-eeprom (10.0-1) buster; urgency=medium
[ andrum99 ] [ andrum99 ]

6
rpi-eeprom-config
View File

@@ -76,7 +76,7 @@ def shell_cmd(args):
exit_error("%s failed: %d\n %s\n %s\n" % exit_error("%s failed: %d\n %s\n %s\n" %
(arg_str, result.returncode, result.stdout.read(), result.stderr.read())) (arg_str, result.returncode, result.stdout.read(), result.stderr.read()))
else: else:
return result.stdout.read() return result.stdout.read().decode('utf-8')
def get_latest_eeprom(): def get_latest_eeprom():
""" """
@@ -131,7 +131,7 @@ def edit_config(eeprom=None):
if os.path.exists(pending): if os.path.exists(pending):
config_src = pending config_src = pending
image = BootloaderImage(pending) image = BootloaderImage(pending)
current_config = image.get_config() current_config = image.get_config().decode('utf-8')
else: else:
config_src = 'vcgencmd bootloader_config' config_src = 'vcgencmd bootloader_config'
current_config = read_current_config() current_config = read_current_config()
@@ -140,7 +140,7 @@ def edit_config(eeprom=None):
# then get the current config from there. # then get the current config from there.
image = BootloaderImage(eeprom) image = BootloaderImage(eeprom)
config_src = eeprom config_src = eeprom
current_config = image.get_config() current_config = image.get_config().decode('utf-8')
create_tempdir() create_tempdir()
tmp_conf = os.path.join(TEMP_DIR, 'boot.conf') tmp_conf = os.path.join(TEMP_DIR, 'boot.conf')