summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Zalewski <pzalewski@thegoodpenguin.co.uk>2022-12-22 10:38:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-15 21:47:00 +0000
commit3cc6ed84cb96ebcd32d4c53d143c825f1870a77b (patch)
tree339c22dace160d644925c2f1be1313b31b70d965
parent6fba96cb032bad4aa6b8c4b7d0b422c3e5465a1c (diff)
downloadpoky-3cc6ed84cb96ebcd32d4c53d143c825f1870a77b.tar.gz
classes/fs-uuid: Fix command output decoding issue
The default return value from subprocess.check_output is an encoded byte. The applied fix will decode the value to a string. (From OE-Core rev: 2bde03a1a58be6636d36229a75450e08492e7a89) Signed-off-by: Pawel Zalewski <pzalewski@thegoodpenguin.co.uk> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 046769fa952a511865c416b80d10af6287147fb7) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-recipe/fs-uuid.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/fs-uuid.bbclass b/meta/classes-recipe/fs-uuid.bbclass
index a9e7eb8c67..e215f06c80 100644
--- a/meta/classes-recipe/fs-uuid.bbclass
+++ b/meta/classes-recipe/fs-uuid.bbclass
@@ -10,7 +10,7 @@
10def get_rootfs_uuid(d): 10def get_rootfs_uuid(d):
11 import subprocess 11 import subprocess
12 rootfs = d.getVar('ROOTFS') 12 rootfs = d.getVar('ROOTFS')
13 output = subprocess.check_output(['tune2fs', '-l', rootfs]) 13 output = subprocess.check_output(['tune2fs', '-l', rootfs], text=True)
14 for line in output.split('\n'): 14 for line in output.split('\n'):
15 if line.startswith('Filesystem UUID:'): 15 if line.startswith('Filesystem UUID:'):
16 uuid = line.split()[-1] 16 uuid = line.split()[-1]