diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-15 23:15:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-22 09:16:00 +0100 |
commit | 4c2d0b1205be2c0e42cafea1de18e46edf4a374b (patch) | |
tree | 929918f4745764c3b5618f1489e540cf0645eeb4 /meta/classes/cross-canadian.bbclass | |
parent | 39df3561d8cb0d6d86d492bb462640cf2f0a760a (diff) | |
download | poky-4c2d0b1205be2c0e42cafea1de18e46edf4a374b.tar.gz |
meta: Remove further uclibc remnants (inc. patches and site files)
Some of these are clearly dead, e.g. one binutils patch reverts the effects
of the earlier one.
This also removes the uclibc site files. We now have mechanisms to allow these
to be extended from another layer should someone ever wish to do that.
(From OE-Core rev: e01e7c543a559c8926d72159b5cd55db0c661434)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cross-canadian.bbclass')
-rw-r--r-- | meta/classes/cross-canadian.bbclass | 6 |
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 | # |
17 | PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" | 17 | PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" |
18 | BASECANADIANEXTRAOS ?= "linux-uclibc linux-musl" | 18 | BASECANADIANEXTRAOS ?= "linux-musl" |
19 | CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}" | 19 | CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}" |
20 | CANADIANEXTRAVENDOR = "" | 20 | CANADIANEXTRAVENDOR = "" |
21 | MODIFYTOS ??= "1" | 21 | MODIFYTOS ??= "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") |