X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=0ad9bf1f61d0263868a1e40f274a567e75771989;hb=refs%2Fheads%2Fmlab;hp=d6ae3c3a84306ca55172b9f1899b1c2972d0ac58;hpb=856538e7ab7378061b5ba589a8c2a4a0f319d27f;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index d6ae3c3a8..0ad9bf1f6 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -29,7 +29,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 49
+%define taglevel 33
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -50,7 +50,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 %define requiresreboot 0
 
-%define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define kernelrelease vs%{vsversion}.%{taglevel}.mlab%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define packagerelease %{kernelrelease}
 
 %define signmodules 0
@@ -204,7 +204,6 @@ Patch660: linux-2.6-660-nmi-watchdog-default.patch
 %if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 Patch670: linux-2.6-670-gcc43.patch
 %endif
-Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
 Patch700: linux-2.6-700-fperm.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
@@ -449,7 +448,7 @@ KERNEL_PREVIOUS=vanilla
 %if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 %ApplyPatch 670
 %endif
-%ApplyPatch 680
+%ApplyPatch 690
 %ApplyPatch 700
 %ApplyPatch 710
 %ApplyPatch 720
@@ -938,6 +937,9 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-50
+- no semantic change - just fixed specfile for git URL, and pull from onelab.eu
+
 * Fri May 07 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-48
 - Support next generation of HP Smart Array SAS/SATA controllers