summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-19 11:42:58 +0000
committerSteve Sakoman <steve@sakoman.com>2021-01-15 08:33:23 -1000
commit4f5ee071c6cc4b47eb51de6190e0089d260f3b60 (patch)
treed14b961a5973cdd7bce5ff9c410f246c0b4860de
parent49f3f86fcaa157f098c1c106ce21e70a688971bc (diff)
downloadopenembedded-core-contrib-stable/dunfell-nut.tar.gz
openembedded-core-contrib-stable/dunfell-nut.tar.bz2
openembedded-core-contrib-stable/dunfell-nut.zip
linuxloader: Avoid confusing string concat errorsstable/dunfell-nut
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> (cherry picked from commit c04f04e714ede5d3904058ec82459139ed5e42fa) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-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 @@
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)