From c5d06ee1f9326b0fa6d8e09e70589f4e0a592b6f Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 30 Oct 2012 15:05:49 -0700 Subject: [PATCH] external-sourcery-toolchain: put linux headers in eglibc packages When building glibc, this is what usually happens -- the headers are sanitized, then they're included in the libc development package(s), so mirror that here. Include the headers with eglibc-dev rather than splitting out separate linux-libc-headers packages. Signed-off-by: Christopher Larson --- recipes/meta/external-sourcery-toolchain.bb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/recipes/meta/external-sourcery-toolchain.bb b/recipes/meta/external-sourcery-toolchain.bb index 5b4647b..ca21321 100644 --- a/recipes/meta/external-sourcery-toolchain.bb +++ b/recipes/meta/external-sourcery-toolchain.bb @@ -22,7 +22,7 @@ PROVIDES = "\ libgcc \ " PV = "${CSL_VER_MAIN}" -PR = "r15" +PR = "r16" #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2" @@ -93,7 +93,6 @@ TC_PACKAGES =+ "libgcc libgcc-dev" TC_PACKAGES =+ "libgomp libgomp-dev libgomp-staticdev" TC_PACKAGES =+ "libstdc++ libstdc++-dev libstdc++-staticdev" TC_PACKAGES =+ "gdbserver gdbserver-dbg" -TC_PACKAGES =+ "${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', PN, 'linux-libc-headers linux-libc-headers-dev', '', d)}" TC_PACKAGES =+ "oprofile" PACKAGES =+ "${TC_PACKAGES}" @@ -119,8 +118,6 @@ PKGV_libgomp-staticdev = "${CSL_VER_GCC}" PKGV_libstdc++ = "${CSL_VER_GCC}" PKGV_libstdc++-dev = "${CSL_VER_GCC}" PKGV_libstdc++-staticdev = "${CSL_VER_GCC}" -PKGV_linux-libc-headers = "${CSL_VER_KERNEL}" -PKGV_linux-libc-headers-dev = "${CSL_VER_KERNEL}" PKGV_gdbserver = "${CSL_VER_GDB}" PKGV_gdbserver-dbg = "${CSL_VER_GDB}" PKGV_oprofile = "${CSL_VER_GCC}" @@ -136,14 +133,6 @@ FILES_libstdc++-dev = "${includedir}/c++/${PV} \ ${libdir}/libstdc++.la \ ${libdir}/libsupc++.la" FILES_libstdc++-staticdev = "${libdir}/libstdc++.a ${libdir}/libsupc++.a" -FILES_linux-libc-headers = "${includedir}/asm* \ - ${includedir}/linux \ - ${includedir}/mtd \ - ${includedir}/rdma \ - ${includedir}/scsi \ - ${includedir}/sound \ - ${includedir}/video \ -" FILES_gdbserver = "${bindir}/gdbserver ${libdir}/bin/sysroot-gdbserver" FILES_gdbserver-dbg = "${bindir}/.debug/gdbserver" FILES_oprofile = "${datadir}/oprofile/* ${libdir}/oprofile/* ${datadir}/stl.pat"