From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 16 Jul 2009 06:06:26 +0000 (+0000)
Subject: glibc providers scis headers for itself
X-Git-Tag: linux-2.6-22-40.coblitz~10
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=215aabd158e57c1892debc590128339557545400

glibc providers scis headers for itself
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 38f06a71a..26c72485c 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -502,6 +502,12 @@ BuildKernel() {
     make -s ARCH=$Arch INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr
     find $RPM_BUILD_ROOT/%{_includedir} -name \*.cmd -delete
     rm -f $RPM_BUILD_ROOT/%{_includedir}/{..,.}{check,install}*
+
+    # glibc provides scsi headers for itself, for now
+    rm -rf $RPM_BUILD_ROOT/usr/include/scsi
+    rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h
+    rm -f $RPM_BUILD_ROOT/usr/include/asm*/io.h
+    rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h
 %endif
 
 %if %{build_iwlwifi}