X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=eddf6cb93c341ff5bb611be32e93ff54972f5464;hb=51d41759d13dbae24fd86d50d4b360f55c43991b;hp=ec0d5b1ae203271818ff3f4ce2ffd8961a06d90f;hpb=f119edb565b108258d1055a25c3af22a2971761c;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index ec0d5b1ae..eddf6cb93 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -232,7 +232,7 @@ Summary: The Linux kernel
 %define pkg_release %{distro_build}%{?dist}%{?buildid}
 %endif
 #### Planet-Lab ####
-%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}.mlab%{?date:.%{date}}
 #### Planet-Lab ####
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -681,6 +681,7 @@ Patch17: linux-2.6-640-netlink-audit-hack.patch
 Patch18: linux-2.6-650-hangcheck-reboot.patch
 Patch19: linux-2.6-660-nmi-watchdog-default.patch
 Patch20: linux-2.6-680-htb-hysteresis-tso.patch
+Patch21: linux-2.6-690-web100.patch
 
 Patch10000: linux-2.6-10000-gcc-4.5.patch
 Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
@@ -1000,6 +1001,7 @@ ApplyPatch linux-2.6-640-netlink-audit-hack.patch
 ApplyPatch linux-2.6-650-hangcheck-reboot.patch
 ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
+ApplyPatch linux-2.6-690-web100.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