diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/cross-canadian.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/icecc.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/insane.bbclass | 24 | ||||
-rw-r--r-- | meta/classes/siteinfo.bbclass | 8 |
4 files changed, 3 insertions, 37 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 # Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS # PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" -BASECANADIANEXTRAOS ?= "linux-uclibc linux-musl" +BASECANADIANEXTRAOS ?= "linux-musl" CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}" CANADIANEXTRAVENDOR = "" MODIFYTOS ??= "1" @@ -36,8 +36,6 @@ python () { tos = d.getVar("TARGET_OS") whitelist = [] extralibcs = [""] - if "uclibc" in d.getVar("BASECANADIANEXTRAOS"): - extralibcs.append("uclibc") if "musl" in d.getVar("BASECANADIANEXTRAOS"): extralibcs.append("musl") for variant in ["", "spe", "x32", "eabi", "n32"]: @@ -80,7 +78,7 @@ python () { for extraos in d.getVar("BASECANADIANEXTRAOS").split(): d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32") if tarch == "arm" or tarch == "armeb": - d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi linux-uclibceabi") + d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi") d.setVar("TARGET_OS", "linux-gnueabi") else: d.setVar("TARGET_OS", "linux") diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 8a351cf3b8..8a3308bdda 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -115,7 +115,7 @@ def use_icecc(bb,d): # for one reason or the other # this is the old list (which doesn't seem to be valid anymore, because I was able to build # all these with icecc enabled) - # system_package_blacklist = [ "uclibc", "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman", "orbit2" ] + # system_package_blacklist = [ "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman", "orbit2" ] # when adding new entry, please document why (how it failed) so that we can re-evaluate it later # e.g. when there is new version # building libgcc-initial with icecc fails with CPP sanity check error if host sysroot contains cross gcc built for another target tune/variant diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index f6fd7c74d8..7444c58c28 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -103,23 +103,6 @@ def package_qa_get_machine_dict(d): "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), }, - "linux-uclibc" : { - "arm" : ( 40, 97, 0, True, 32), - "armeb": ( 40, 97, 0, False, 32), - "powerpc": ( 20, 0, 0, False, 32), - "i386": ( 3, 0, 0, True, 32), - "i486": ( 3, 0, 0, True, 32), - "i586": ( 3, 0, 0, True, 32), - "i686": ( 3, 0, 0, True, 32), - "x86_64": ( 62, 0, 0, True, 64), - "mips": ( 8, 0, 0, False, 32), - "mipsel": ( 8, 0, 0, True, 32), - "mips64": ( 8, 0, 0, False, 64), - "mips64el": ( 8, 0, 0, True, 64), - "avr32": (6317, 0, 0, False, 32), - "sh4": (42, 0, 0, True, 32), - - }, "linux-musl" : { "aarch64" : (183, 0, 0, True, 64), "aarch64_be" :(183, 0, 0, False, 64), @@ -151,19 +134,12 @@ def package_qa_get_machine_dict(d): "arm" : (40, 0, 0, True, 32), "armeb" : (40, 0, 0, False, 32), }, - "linux-uclibceabi" : { - "arm" : (40, 0, 0, True, 32), - "armeb" : (40, 0, 0, False, 32), - }, "linux-gnuspe" : { "powerpc": (20, 0, 0, False, 32), }, "linux-muslspe" : { "powerpc": (20, 0, 0, False, 32), }, - "linux-uclibcspe" : { - "powerpc": (20, 0, 0, False, 32), - }, "linux-gnu" : { "powerpc": (20, 0, 0, False, 32), "sh4": (42, 0, 0, True, 32), diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 2c33732be3..90ea5ba807 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -62,9 +62,6 @@ def siteinfo_data(d): "linux-gnun32": "common-linux common-glibc", "linux-gnueabi": "common-linux common-glibc", "linux-gnuspe": "common-linux common-glibc", - "linux-uclibc": "common-linux common-uclibc", - "linux-uclibceabi": "common-linux common-uclibc", - "linux-uclibcspe": "common-linux common-uclibc", "linux-musl": "common-linux common-musl", "linux-musleabi": "common-linux common-musl", "linux-muslspe": "common-linux common-musl", @@ -79,9 +76,7 @@ def siteinfo_data(d): "aarch64_be-linux-musl": "aarch64_be-linux", "arm-linux-gnueabi": "arm-linux", "arm-linux-musleabi": "arm-linux", - "arm-linux-uclibceabi": "arm-linux-uclibc", "armeb-linux-gnueabi": "armeb-linux", - "armeb-linux-uclibceabi": "armeb-linux-uclibc", "armeb-linux-musleabi": "armeb-linux", "mips-linux-musl": "mips-linux", "mipsel-linux-musl": "mipsel-linux", @@ -93,10 +88,8 @@ def siteinfo_data(d): "mipsisa64r6el-linux-gnun32": "mipsisa32r6el-linux bit-32", "powerpc-linux": "powerpc32-linux", "powerpc-linux-musl": "powerpc-linux powerpc32-linux", - "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux", "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", "powerpc-linux-muslspe": "powerpc-linux powerpc32-linux", - "powerpc-linux-uclibcspe": "powerpc-linux powerpc32-linux powerpc-linux-uclibc", "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux", "powerpc64-linux-muslspe": "powerpc-linux powerpc64-linux", "powerpc64-linux": "powerpc-linux", @@ -106,7 +99,6 @@ def siteinfo_data(d): "x86_64-darwin9": "bit-64", "x86_64-linux": "bit-64", "x86_64-linux-musl": "x86_64-linux bit-64", - "x86_64-linux-uclibc": "bit-64", "x86_64-elf": "bit-64", "x86_64-linux-gnu": "bit-64 x86_64-linux", "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux", |