--- kernel-2.6.spec 2007-06-12 20:25:22.000000000 +0200 +++ kernel-2.6-kwizart.spec 2007-07-10 00:35:42.000000000 +0200 @@ -65,6 +65,9 @@ %define rpmversion 2.6.%{sublevel} %define release %(R="$Revision: 1.3228 $"; RR="${R##: }"; echo ${RR%%?})%{?dist}%{?buildid} +%define mac80211_v 9.0.0 +%define iwlwifi_v 0.0.35 + %define make_target bzImage %define kernel_image x86 @@ -340,6 +343,7 @@ %endif BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config BuildRequires: sparse >= 0.3 +BuildRequires: rsync BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -389,6 +393,10 @@ Source81: config-rhel-x86-generic Source82: config-olpc-generic +# iwlwifi from intellinuxwireless.org +Source90: http://intellinuxwireless.org/mac80211/downloads/mac80211-%{mac80211_v}.tgz +Source91: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-%{iwlwifi_v}.tgz + # # Patches 0 through 100 are meant for core subsystem upgrades # @@ -1418,6 +1426,22 @@ %patch2302 -p1 # avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts %patch2303 -p1 +# iwl3945 iwl4965 +tar zxvf %{SOURCE90} +pushd mac80211-%{mac80211_v} +make \ + KSRC="%{_builddir}/kernel-%{rpmversion}/linux-%{rpmversion}.%{_target_cpu}/" \ + BASE="%{_builddir}/kernel-%{rpmversion}/linux-%{rpmversion}.%{_target_cpu}/mac80211-%{mac80211_v}" \ + MAC80211_VERSION="%{mac80211_v}" patch_kernel +popd +tar zxvf %{SOURCE91} +pushd iwlwifi-%{iwlwifi_v} +make \ + KSRC="%{_builddir}/kernel-%{rpmversion}/linux-%{rpmversion}.%{_target_cpu}/" \ + KMISC="/lib/modules/%{rpmversion}-%{release}/extra/iwlwifi" \ + KVER="%{rpmversion}-%{release}" \ + patch_kernel +popd # Assorted dyntick/clock/timer fixes. %patch2402 -p1 @@ -2405,6 +2429,10 @@ %endif %changelog +* Fri Jul 10 2007 kwizart +- Patch mac80211 0.9.0 and iwlwifi 0.0.35 from + http://intellinuxwireless.org + * Tue Jun 12 2007 Dave Jones - 2.6.21.5