From 784f04848ebf0a7862995ad2dcda7cf14a8e96ba Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 7 Jul 2020 12:31:12 -0700 Subject: [PATCH] Revert "glibc-external: provide linux-libc-headers" This reverts commit 6d7d0b4adcffc588f7bba84dda7064d78a8207b2. --- conf/distro/include/tcmode-external.inc | 1 - recipes-external/glibc/glibc-external.bb | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/conf/distro/include/tcmode-external.inc b/conf/distro/include/tcmode-external.inc index 52e0375..3c18471 100644 --- a/conf/distro/include/tcmode-external.inc +++ b/conf/distro/include/tcmode-external.inc @@ -19,7 +19,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate ?= "gcc-external-cro PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ ?= "gcc-external-cross-${TARGET_ARCH}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils ?= "binutils-external-cross-${TARGET_ARCH}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs ?= "gcc-runtime-external" -PREFERRED_PROVIDER_linux-libc-headers = "glibc-external" PREFERRED_PROVIDER_gcc-runtime = "gcc-runtime-external" PREFERRED_PROVIDER_gcc-sanitizers ?= "gcc-sanitizers-external" PREFERRED_PROVIDER_libgcc-initial = "libgcc-external" diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index 36a2d90..65f82be 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -17,8 +17,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}binutils" PROVIDES += "glibc \ virtual/libc \ virtual/libintl \ - virtual/libiconv \ - linux-libc-headers" + virtual/libiconv" def get_external_libc_license(d): errnosearch = os.path.join(d.getVar('includedir', True), 'errno.h') @@ -238,8 +237,3 @@ do_packagedata[depends] += "gcc-runtime:do_packagedata" FILES_${PN}-dev_remove = "${base_libdir}/*_nonshared.a ${libdir}/*_nonshared.a" FILES_${PN}-dev += "${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a ${libdir}/libmvec_nonshared.a" - -RPROVIDES_${PN} += "linux-libc-headers" -RPROVIDES_${PN}-dev += "linux-libc-headers-dev" -RPROVIDES_${PN}-dbg += "linux-libc-headers-dbg" -RDEPENDS_${PN}-dev_remove = "linux-libc-headers"