From e1798f5e39105d860e5971624d5ad456084acf54 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 18 Jun 2010 09:44:33 +0100 Subject: linux-libc-headers: delete include/scsi/scsi.h, it's not for userspace include/scsi/scsi.h is not userland parsable and research indicates this is because the header should not be exposed to userspace. Therefore remove it in the install. Research done by Tom Rini in OE commit 91d3d92a626da89dfe13d63e68a90dbafdbaef1d This has been the case since kernel 2.6.31 Bump glibc and uclibc PR's so that users have sane Signed-off-by: Joshua Lock --- meta/packages/glibc/glibc_2.4.bb | 2 +- meta/packages/glibc/glibc_2.9.bb | 2 +- meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb | 4 +++- meta/packages/uclibc/uclibc_0.9.30.1.bb | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb index 3102c5953c..ad6840e9bf 100644 --- a/meta/packages/glibc/glibc_2.4.bb +++ b/meta/packages/glibc/glibc_2.4.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r13" +PR = "r14" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/meta/packages/glibc/glibc_2.9.bb b/meta/packages/glibc/glibc_2.9.bb index eec2ed29e2..15b625b760 100644 --- a/meta/packages/glibc/glibc_2.9.bb +++ b/meta/packages/glibc/glibc_2.9.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r1" +PR = "r2" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb index 4a63910e82..a299f55c29 100644 --- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb +++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.33.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://hayes-gone.patch" @@ -41,6 +41,8 @@ do_compile () { do_install() { set_arch oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH + # Kernel should not be exporting this header + rm -f ${D}${exec_prefix}/include/scsi/scsi.h } BBCLASSEXTEND = "nativesdk" diff --git a/meta/packages/uclibc/uclibc_0.9.30.1.bb b/meta/packages/uclibc/uclibc_0.9.30.1.bb index 14b59b74e3..6bdf153a2a 100644 --- a/meta/packages/uclibc/uclibc_0.9.30.1.bb +++ b/meta/packages/uclibc/uclibc_0.9.30.1.bb @@ -9,7 +9,7 @@ UCLIBC_BASE ?= "0.9.30.1" require uclibc.inc -PR = "r0" +PR = "r1" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" -- cgit v1.2.3-54-g00ecf