coblitz configuration

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 38f06a7..ea63722 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -190,6 +190,7 @@ Patch670: linux-2.6-670-gcc43.patch
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
+Patch730: linux-2.6-730-igb-driver.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -409,6 +410,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 680
 %ApplyPatch 690
 %ApplyPatch 710
+%ApplyPatch 730
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@ -502,6 +504,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}