X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=c968d01a5883ec3329fc85498420dc97ca475085;hb=d526ad0102fbd694af7e83ee95646e977a89ec86;hp=827f7861ec7e89174a8a2584d226c6b496718a23;hpb=b16f97729a1f6202aade386ca1218d37e8d5090c;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 827f7861e..c968d01a5 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -10,7 +10,7 @@ URL: %{SCMURL} %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 27 +%define taglevel 31 %define sublevel 32 @@ -661,6 +661,7 @@ Source81: config-i686-debug-rhel Source82: config-generic Source83: config-x86_64-debug-rhel +Patch0: linux-2.6-001-bcm5720.patch Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff Patch2: linux-2.6-255-vserver-delta-cow-fix23.patch Patch3: linux-2.6-250-ipsets.patch @@ -979,6 +980,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} . make -f %{SOURCE20} VERSION=%{version} configs #### Planet-Lab #### +ApplyPatch linux-2.6-001-bcm5720.patch ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.diff ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.patch ApplyPatch linux-2.6-250-ipsets.patch @@ -1793,6 +1795,20 @@ fi %endif %changelog +* Thu May 03 2012 Sapan Bhatia - linux-2.6-32-31 +- For some reason the -30 tag did not get created in Linux-2.6. Might be because of a temporary problem with the git +- server. + +* Tue May 01 2012 Sapan Bhatia - linux-2.6-32-30 +- Fixed a compile error. + +* Tue May 01 2012 Sapan Bhatia - linux-2.6-32-29 +- Renamed the latest patch file to something build doesn't reject. + +* Tue May 01 2012 Sapan Bhatia - linux-2.6-32-28 +- This patch adds a backported version of a patchset to support the bcm5720 chipset, used by various PlanetLab and MLab +- members. + * Mon Nov 07 2011 Thierry Parmentelat - linux-2.6-32-27 - 2 places for pulling sources from in case of network outage