diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2024-01-07 11:34:48 +0100 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-02-07 04:00:02 -1000 |
| commit | d94ab548b0e343daf41c2341abad722aa39bb870 (patch) | |
| tree | 44b3154e70d4a95fb9757f91b6eb0ff7f8af9e71 | |
| parent | 801c3f25ccada35b0f654e37e372286941a36823 (diff) | |
| download | poky-d94ab548b0e343daf41c2341abad722aa39bb870.tar.gz | |
qemu.bbclass: fix a python TypeError
QEMU_OPTIONS can be empty which will trigger a exception TypeError:
| can only concatenate str (not "NoneType") to str. Fix it by setting a
empty string.
ALso removed two useless blanks.
(From OE-Core rev: 3ccc642bb36373e81d80d41b4f213328c7bfb9cb)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b619197bd52a4a99a9989e7ea6fb7032415b1e42)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes-recipe/qemu.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/qemu.bbclass b/meta/classes-recipe/qemu.bbclass index 874b15127c..dbb5ee0b66 100644 --- a/meta/classes-recipe/qemu.bbclass +++ b/meta/classes-recipe/qemu.bbclass | |||
| @@ -34,7 +34,7 @@ def qemu_wrapper_cmdline(data, rootfs_path, library_paths): | |||
| 34 | if qemu_binary == "qemu-allarch": | 34 | if qemu_binary == "qemu-allarch": |
| 35 | qemu_binary = "qemuwrapper" | 35 | qemu_binary = "qemuwrapper" |
| 36 | 36 | ||
| 37 | qemu_options = data.getVar("QEMU_OPTIONS") | 37 | qemu_options = data.getVar("QEMU_OPTIONS") or "" |
| 38 | 38 | ||
| 39 | return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\ | 39 | return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\ |
| 40 | + " -E LD_LIBRARY_PATH=" + ":".join(library_paths) + " " | 40 | + " -E LD_LIBRARY_PATH=" + ":".join(library_paths) + " " |