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:40 +0000 |
| commit | 132cafc75a708c63763a93cec160298ceb112f91 (patch) | |
| tree | a5c9be4f7517b4a5d761528bcfed093140eabb29 | |
| parent | c7bf9aebd002fc6bc23a57bc5e9863382bd17ae7 (diff) | |
| download | openembedded-core-132cafc75a708c63763a93cec160298ceb112f91.tar.gz | |
linuxloader: Avoid confusing string concat errorsgatesgarth-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 720e5dfad4..b161c51a50 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"): @@ -32,7 +32,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" @@ -58,7 +58,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) |