summaryrefslogtreecommitdiffstats
path: root/meta/classes/cross-canadian.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/cross-canadian.bbclass')
-rw-r--r--meta/classes/cross-canadian.bbclass6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 49388d4cf2..8554e87521 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -15,7 +15,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS 15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
16# 16#
17PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" 17PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}"
18BASECANADIANEXTRAOS ?= "linux-uclibc linux-musl" 18BASECANADIANEXTRAOS ?= "linux-musl"
19CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}" 19CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}"
20CANADIANEXTRAVENDOR = "" 20CANADIANEXTRAVENDOR = ""
21MODIFYTOS ??= "1" 21MODIFYTOS ??= "1"
@@ -36,8 +36,6 @@ python () {
36 tos = d.getVar("TARGET_OS") 36 tos = d.getVar("TARGET_OS")
37 whitelist = [] 37 whitelist = []
38 extralibcs = [""] 38 extralibcs = [""]
39 if "uclibc" in d.getVar("BASECANADIANEXTRAOS"):
40 extralibcs.append("uclibc")
41 if "musl" in d.getVar("BASECANADIANEXTRAOS"): 39 if "musl" in d.getVar("BASECANADIANEXTRAOS"):
42 extralibcs.append("musl") 40 extralibcs.append("musl")
43 for variant in ["", "spe", "x32", "eabi", "n32"]: 41 for variant in ["", "spe", "x32", "eabi", "n32"]:
@@ -80,7 +78,7 @@ python () {
80 for extraos in d.getVar("BASECANADIANEXTRAOS").split(): 78 for extraos in d.getVar("BASECANADIANEXTRAOS").split():
81 d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32") 79 d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32")
82 if tarch == "arm" or tarch == "armeb": 80 if tarch == "arm" or tarch == "armeb":
83 d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi linux-uclibceabi") 81 d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi")
84 d.setVar("TARGET_OS", "linux-gnueabi") 82 d.setVar("TARGET_OS", "linux-gnueabi")
85 else: 83 else:
86 d.setVar("TARGET_OS", "linux") 84 d.setVar("TARGET_OS", "linux")