diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-19 11:42:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-27 09:31:54 +0000 |
| commit | bd34095b0f706d05d631f9ff0d0be80fdaad8411 (patch) | |
| tree | 8923be35ec91eaf0e7b515d2dce4cbf4aa1317d6 | |
| parent | 897822233faef0f8f35dc1d8a39e1c4bc0550f1e (diff) | |
| download | openembedded-core-dunfell-next.tar.gz openembedded-core-dunfell-next.tar.bz2 openembedded-core-dunfell-next.zip | |
linuxloader: Avoid confusing string concat errorsdunfell-next
None is a bad choice of return value for functions used in variables
(strings) as a failure results in concatination errors. Use a string
with a clear meaning that can be searched for instead.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/linuxloader.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/linuxloader.bbclass b/meta/classes/linuxloader.bbclass index ec0e0556dd..796ab3afe4 100644 --- a/meta/classes/linuxloader.bbclass +++ b/meta/classes/linuxloader.bbclass @@ -1,6 +1,6 @@ def get_musl_loader_arch(d): import re - ldso_arch = None + ldso_arch = "NotSupported" targetarch = d.getVar("TARGET_ARCH") if targetarch.startswith("microblaze"): @@ -30,7 +30,7 @@ def get_musl_loader(d): def get_glibc_loader(d): import re - dynamic_loader = None + dynamic_loader = "NotSupported" targetarch = d.getVar("TARGET_ARCH") if targetarch in ["powerpc", "microblaze"]: dynamic_loader = "${base_libdir}/ld.so.1" @@ -56,7 +56,7 @@ def get_linuxloader(d): overrides = d.getVar("OVERRIDES").split(":") if "libc-baremetal" in overrides: - return None + return "NotSupported" if "libc-musl" in overrides: dynamic_loader = get_musl_loader(d) |