mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

linuxloader.bbclass: Refactor to have seprate functions for musl/glibc loader

Browse Source 
this makes it possible to use this for musl where we are trying to
create a glibc compat package

Add missing aarch64 loader definition for glibc function

(From OE-Core rev: 0a02ea79ec522582b46138a027eb166819e5647d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2018-09-19 20:52:41 -07:00
committed by Richard Purdie
parent 18b90a0fd9
commit 244caa1dbf
1 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/linuxloader.bbclass
+26 -13
View File
@@ -1,15 +1,8 @@
def get_linuxloader(d): def get_musl_loader(d):
import re import re
dynamic_loader = None
targetarch = d.getVar("TARGET_ARCH") targetarch = d.getVar("TARGET_ARCH")
overrides = d.getVar("OVERRIDES").split(":")
# No loader for baremetal
if "libc-baremetal" in overrides:
return None
dynamic_loader = None
if "libc-musl" in overrides:
if targetarch.startswith("microblaze"): if targetarch.startswith("microblaze"):
dynamic_loader = "${base_libdir}/ld-musl-microblaze${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'el' ,d)}.so.1" dynamic_loader = "${base_libdir}/ld-musl-microblaze${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'el' ,d)}.so.1"
elif targetarch.startswith("mips"): elif targetarch.startswith("mips"):
@@ -26,8 +19,13 @@ def get_linuxloader(d):
dynamic_loader = "${base_libdir}/ld-musl-arm${ARMPKGSFX_ENDIAN}${ARMPKGSFX_EABI}.so.1" dynamic_loader = "${base_libdir}/ld-musl-arm${ARMPKGSFX_ENDIAN}${ARMPKGSFX_EABI}.so.1"
elif targetarch.startswith("aarch64"): elif targetarch.startswith("aarch64"):
dynamic_loader = "${base_libdir}/ld-musl-aarch64${ARMPKGSFX_ENDIAN_64}.so.1" dynamic_loader = "${base_libdir}/ld-musl-aarch64${ARMPKGSFX_ENDIAN_64}.so.1"
else: return dynamic_loader
# glibc
def get_glibc_loader(d):
import re
dynamic_loader = None
targetarch = d.getVar("TARGET_ARCH")
if targetarch in ["powerpc", "microblaze"]: if targetarch in ["powerpc", "microblaze"]:
dynamic_loader = "${base_libdir}/ld.so.1" dynamic_loader = "${base_libdir}/ld.so.1"
elif targetarch in ["mipsisa32r6el", "mipsisa32r6", "mipsisa64r6el", "mipsisa64r6"]: elif targetarch in ["mipsisa32r6el", "mipsisa32r6", "mipsisa64r6el", "mipsisa64r6"]:
@@ -42,7 +40,22 @@ def get_linuxloader(d):
dynamic_loader = "${base_libdir}/ld-linux.so.2" dynamic_loader = "${base_libdir}/ld-linux.so.2"
elif targetarch == "arm": elif targetarch == "arm":
dynamic_loader = "${base_libdir}/ld-linux.so.3" dynamic_loader = "${base_libdir}/ld-linux.so.3"
elif targetarch.startswith("aarch64"):
dynamic_loader = "${base_libdir}/ld-linux-aarch64${ARMPKGSFX_ENDIAN_64}.so.1"
return dynamic_loader return dynamic_loader
get_linuxloader[vardepvalue] = "${@get_linuxloader(d)}"
def get_linuxloader(d):
overrides = d.getVar("OVERRIDES").split(":")
if "libc-baremetal" in overrides:
return None
if "libc-musl" in overrides:
dynamic_loader = get_musl_loader(d)
else:
dynamic_loader = get_glibc_loader(d)
return dynamic_loader
get_linuxloader[vardepvalue] = "${@get_linuxloader(d)}"
get_musl_loader[vardepvalue] = "${@get_musl_loader(d)}"
get_glibc_loader[vardepvalue] = "${@get_glibc_loader(d)}"