[oe] [PATCH] Remove scsi headers from linux-libc-headers

[Tom Rini]

linux-libc-headers: Go and delete include/scsi when it exists

With 2.6.31, the kernel started exporting SCSI headers again.  After
talking with Christoph Hellwig and James Bottemley (scsi maintainer),
these really should be removed.  A patch to the kernel to do so will be
happening shortly, but for now fixup the broken recipes we have.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
index 2e4041f..c2cf5d4 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -44,6 +44,7 @@ do_compile () {
 do_install() {
 	set_arch
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+	rm -rf ${D}${exec_prefix}/include/scsi
 }
 
 SRC_URI[md5sum] = "84c077a37684e4cbfa67b18154390d8a"
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
index d82a749..b8b109e 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -44,6 +44,7 @@ do_compile () {
 do_install() {
 	set_arch
 	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=
$ARCH
+	rm -rf ${D}${exec_prefix}/include/scsi
 }
 
 SRC_URI[md5sum] = "260551284ac224c3a43c4adac7df4879"



-- 
Tom Rini <tom_rini at mentor.com>
Mentor Graphics Corporation