# adding some text to the end of the version number.
#
%define sublevel 22
-%define patchlevel 14
+%define patchlevel 18
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}}
-%define vsversion 2.3.0.29
+%define vsversion 2.3.0.32
# Will go away when VServer supports NetNS in mainline. Currently, it must be
# updated every time the PL kernel is updated.
# Linux-VServer
Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
+Patch210: linux-2.6-210-vserver-cpu-sched.patch
# IP sets
Patch250: linux-2.6-250-ipsets.patch
Patch570: linux-2.6-570-tagxid.patch
# See also the file named 'sources' here for the related checksums
+# NOTE. iwlwifi should be in-kernel starting from 2.6.24
+# see http://bughost.org/bugzilla/show_bug.cgi?id=1584
%define mac80211_version 10.0.4
Patch600: http://intellinuxwireless.org/mac80211/downloads/mac80211-%{mac80211_version}.tgz
%define iwlwifi_version 1.2.23
KERNEL_PREVIOUS=linux-%{kversion}-%1
# This is where the patches get applied
-%if "0%{patchlevel}"
+%if 0%{?patchlevel}
%ApplyPatch 0
%endif
%ApplyPatch 100
%ApplyPatch 200
+%ApplyPatch 210
%ApplyPatch 250
%endif
# Run the mac80211 stuff in the kernel tree holding the last patch
-tar -xzf %{expand:%{PATCH600}}
+tar -xzf %{PATCH600}
pushd mac80211-%{mac80211_version}
mac80211_makeflags="KSRC=../$KERNEL_PREVIOUS"
make $mac80211_makeflags modified
popd
# Untar iwlwifi in the same place - needs to be compiled later
-tar -xzf %{expand:%{PATCH601}}
+tar -xzf %{PATCH601}
# the install target is broken: first it does not pass the right -b flag to depmod
# second we do not need to invoke depmod at this stage anyway
# let's add our own patch/stuff in this Makefile for manual install later on