add patch1430 to support tg3 newer chipsets

(Apple Thunderbolt Gigabit Ethernet adapter)


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6639 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kernel/kernel-vl.spec

@@ -2,6 +2,12 @@
 %define _minimum_patches 0
 %define _apply_drm_patches 1
 
+%if "%{?_dist_release}" > "vl6"
+%global kmod kmod
+%else
+%global kmod module-init-tools
+%endif
+
 Summary: The Linux kernel (the core of the Linux operating system)
 Summary(ja): Linux カーネル (Linux オペレーティングシステムの心臓部分)
 
@@ -28,7 +34,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define patchlevel 6
 %define kversion 3.%{sublevel}
 %define rpmversion 3.%{sublevel}.%{patchlevel}
-%define release 2%{?_dist_release}
+%define release 3%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -150,7 +156,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, kmod, initscripts >= 8.80, mkinitrd >= 6.0.93, linux-firmware >= 20110601-1
+%define kernel_prereq  fileutils, %{kmod}, initscripts >= 8.80, mkinitrd >= 6.0.93, linux-firmware >= 20110601-1
 
 Name: kernel
 Group: System Environment/Kernel
@@ -176,7 +182,7 @@ AutoReqProv: no
 #
 # List the packages used during the kernel build
 #
-BuildRequires: kmod
+BuildRequires: %{kmod}
 BuildRequires: patch >= 2.5.4, bash >= 2.03, tar
 BuildRequires: coreutils
 BuildRequires: bzip2, gzip, xz
@@ -236,20 +242,8 @@ Patch800: linux-2.6-build-nonintconfig.patch
 
 Patch1394: linux-2.6-zd1211rw-gw-us54gxs.patch
 
-# e1000e update
-Patch1400: linux-2.6-e1000e-update.patch
-
-# iwlwifi new ucode support
-Patch1410: linux-2.6.35-iwlwifi-support-new-ucode.patch
-
-# initial MBA Mid2011 hacky support
-Patch1420: linux-3.0.4_macbookair_middle2011_fixedmode_hackyhack.patch
-
-# MBA Mid2011 trackpad support
-#Patch1421: linux-3.0.4_macbookair_middle2011_trackpad.patch
-
-# MBA Mid2011 special keys support
-#Patch1422: linux-3.1.3_macbookair_middle2011_hid.patch
+# tg3 add new id (577[68][26])
+Patch1430: linux-3.4.6-tg3-support-newid.patch
 
 # Misc bits.
 Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
@@ -261,8 +255,13 @@ Patch1840: linux-2.6-defaults-pci_no_msi.patch
 Patch1850: linux-2.6-silence-fbcon-logo.patch
 Patch1860: linux-2.6-silence-acpi-blacklist.patch
 Patch1890: linux-2.6.35-mmc-sdhci-update.patch
+
 Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
 
+# initial MBA Mid2011 hacky support
+Patch1910: linux-3.0.4_macbookair_middle2011_fixedmode_hackyhack.patch
+
+
 # VM bits
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 
@@ -564,15 +563,8 @@ cd linux-%{kversion}
 # add support PLANEX GW-US54GXS
 ##VINE## %patch1394 -p1
 
-# e1000e
-##VINE## %patch1400 -p1
-
-# initial MBA Mid2011 hacky support
-%patch1420 -p1
-# MBA Mid2011 trackpad support
-#%patch1421 -p1
-# MBA Mid2011 special keys support
-#%patch1422 -p1
+# tg3
+%patch1430 -p1
 
 # Misc fixes
 # Make multimedia buttons on Dell Inspiron 8200 work.
@@ -601,6 +593,9 @@ cd linux-%{kversion}
 # https://lkml.org/lkml/2011/2/15/605
 ##VINE## %patch1900 -p1
 
+# initial MBA Mid2011 hacky support
+%patch1910 -p1
+
 
 #
 # VM related fixes.
@@ -1177,6 +1172,9 @@ fi
 
 
 %changelog
+* Fri Jul 27 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.4.6-3
+- add patch1430 to support tg3 newer chipsets
+
 * Sat Jul 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.4.6-2
 - add kmod to kernel_prereq (instead of module-init-tools)