%define name linux-2.6
%define module_version_varname sublevel
-%define taglevel 27
+# 131 borrowed from centos6.1, tg3 from 220 centos 6.2
+%define taglevel 131.vs230.web10027.xidmask
-%define sublevel 32
+%define sublevel 33
%if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6)
%define modern_distro 1
%define pkg_release %{distro_build}%{?dist}%{?buildid}
%endif
#### Planet-Lab ####
-%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}.mlab%{?date:.%{date}}
+#%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}.mlab%{?date:.%{date}}
+# this branch is now unique to the mlab build. so pldistro==mlab
+%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
#### Planet-Lab ####
%define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
Patch20: linux-2.6-680-htb-hysteresis-tso.patch
Patch21: linux-2.6-690-web100.patch
Patch22: linux-2.6-700-bcm5720.patch
+Patch23: linux-2.6-710-xidmask.patch
Patch10000: linux-2.6-10000-gcc-4.5.patch
Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
ApplyPatch linux-2.6-690-web100.patch
ApplyPatch linux-2.6-700-bcm5720.patch
+ApplyPatch linux-2.6-710-xidmask.patch
ApplyPatch linux-2.6-10000-gcc-4.5.patch
ApplyPatch linux-2.6-10001-gcc-4.6-warnoff.patch
ApplyPatch linux-2.6-10002-gcc-4.6-sense_buffer.patch