From ec03023d2165b49a52b83bac1ea2f0bfded7b852 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 15 Jun 2017 18:25:54 +0100 Subject: meta: Drop further remnants of uclibc support uclibc support was removed a while ago and musl works much better. Start to remove the various overrides and patches related to uclibc which are no longer needed. uclibc support in a layer would still be possible. I have strong reasons to believe nobody is still using uclibc since patches are missing and I doubt the metadata even parses anymore. Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 1 - meta/classes/native.bbclass | 2 +- meta/classes/toolchain-scripts.bbclass | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 9a04b43674..d806f7ea45 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -85,7 +85,6 @@ PID = "${@os.getpid()}" PACKAGE_ARCH = "${MACHINE_ARCH}" LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot" -LDCONFIGDEPEND_libc-uclibc = "" LDCONFIGDEPEND_libc-musl = "" # This is needed to have depmod data in PKGDATA_DIR, diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 6b7f3dd76e..9c434dce83 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -108,7 +108,7 @@ PKG_CONFIG_SYSROOT_DIR = "" PKG_CONFIG_SYSTEM_LIBRARY_PATH[unexport] = "1" PKG_CONFIG_SYSTEM_INCLUDE_PATH[unexport] = "1" -# we dont want libc-uclibc or libc-glibc to kick in for native recipes +# we dont want libc-*libc to kick in for native recipes LIBCOVERRIDE = "" CLASSOVERRIDE = "class-native" MACHINEOVERRIDES = "" diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 260ece9676..0ee0ec53f5 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -3,7 +3,6 @@ inherit toolchain-scripts-base siteinfo kernel-arch # We want to be able to change the value of MULTIMACH_TARGET_SYS, because it # doesn't always match our expectations... but we default to the stock value REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}" -TARGET_CC_ARCH_append_libc-uclibc = " -muclibc" TARGET_CC_ARCH_append_libc-musl = " -mmusl" # default debug prefix map isn't valid in the SDK -- cgit v1.2.3