summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-19 11:42:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-27 09:33:15 +0000
commit7ea41de13774675828239b7738d3f5d70be8b1af (patch)
tree693affdea8104b7bd93fd1f06a8c62f291090bdf /meta/classes
parent8fbb62264f6213a6676858d0cfb5a94de69f83c1 (diff)
downloadpoky-7ea41de13774675828239b7738d3f5d70be8b1af.tar.gz
linuxloader: Avoid confusing string concat errors
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. (From OE-Core rev: b286258fc2f6974a88ebd90d3c2f9465437cfcfd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/linuxloader.bbclass6
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 @@
1def get_musl_loader_arch(d): 1def get_musl_loader_arch(d):
2 import re 2 import re
3 ldso_arch = None 3 ldso_arch = "NotSupported"
4 4
5 targetarch = d.getVar("TARGET_ARCH") 5 targetarch = d.getVar("TARGET_ARCH")
6 if targetarch.startswith("microblaze"): 6 if targetarch.startswith("microblaze"):
@@ -30,7 +30,7 @@ def get_musl_loader(d):
30def get_glibc_loader(d): 30def get_glibc_loader(d):
31 import re 31 import re
32 32
33 dynamic_loader = None 33 dynamic_loader = "NotSupported"
34 targetarch = d.getVar("TARGET_ARCH") 34 targetarch = d.getVar("TARGET_ARCH")
35 if targetarch in ["powerpc", "microblaze"]: 35 if targetarch in ["powerpc", "microblaze"]:
36 dynamic_loader = "${base_libdir}/ld.so.1" 36 dynamic_loader = "${base_libdir}/ld.so.1"
@@ -56,7 +56,7 @@ def get_linuxloader(d):
56 overrides = d.getVar("OVERRIDES").split(":") 56 overrides = d.getVar("OVERRIDES").split(":")
57 57
58 if "libc-baremetal" in overrides: 58 if "libc-baremetal" in overrides:
59 return None 59 return "NotSupported"
60 60
61 if "libc-musl" in overrides: 61 if "libc-musl" in overrides:
62 dynamic_loader = get_musl_loader(d) 62 dynamic_loader = get_musl_loader(d)