X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=ea637223c24254b9973bba60a728b42078be6a5f;hb=83c59abfe5025e0fe619476440220ffdf75aabcc;hp=38f06a71ae351558cff03a73eac7b6cd71da634f;hpb=f9c69fe9babcb8650133b420d8bcb6fafb05e3cd;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 38f06a71a..ea637223c 100644
--- 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}