summaryrefslogtreecommitdiffstats
path: root/meta/classes/linuxloader.bbclass
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:32:45 +0000
commit9de9e2e3194525c8eea57ebc3c7396b4695549a7 (patch)
tree3838188e9444732a628c1ebb81ee0f760881a8af /meta/classes/linuxloader.bbclass
parentb97e7a717c3c4ff42ae102f9a3677a2e4da5d5ae (diff)
downloadpoky-9de9e2e3194525c8eea57ebc3c7396b4695549a7.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: 4e8022635fc8543d135fed3091a9f555899d1b3c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/linuxloader.bbclass')
-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 720e5dfad4..b161c51a50 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"):
@@ -32,7 +32,7 @@ def get_musl_loader(d):
32def get_glibc_loader(d): 32def get_glibc_loader(d):
33 import re 33 import re
34 34
35 dynamic_loader = None 35 dynamic_loader = "NotSupported"
36 targetarch = d.getVar("TARGET_ARCH") 36 targetarch = d.getVar("TARGET_ARCH")
37 if targetarch in ["powerpc", "microblaze"]: 37 if targetarch in ["powerpc", "microblaze"]:
38 dynamic_loader = "${base_libdir}/ld.so.1" 38 dynamic_loader = "${base_libdir}/ld.so.1"
@@ -58,7 +58,7 @@ def get_linuxloader(d):
58 overrides = d.getVar("OVERRIDES").split(":") 58 overrides = d.getVar("OVERRIDES").split(":")
59 59
60 if "libc-baremetal" in overrides: 60 if "libc-baremetal" in overrides:
61 return None 61 return "NotSupported"
62 62
63 if "libc-musl" in overrides: 63 if "libc-musl" in overrides:
64 dynamic_loader = get_musl_loader(d) 64 dynamic_loader = get_musl_loader(d)