X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=c968d01a5883ec3329fc85498420dc97ca475085;hb=d526ad0102fbd694af7e83ee95646e977a89ec86;hp=03311006e45951ec9a5ed8d7b2fcfe32fae09fd5;hpb=be045a194eb6c82c66a4d4b9fcc7986d0e1e417a;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 03311006e..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 20 +%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 @@ -685,7 +686,9 @@ Patch20: linux-2.6-680-htb-hysteresis-tso.patch Patch10000: linux-2.6-10000-gcc-4.5.patch Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch Patch10002: linux-2.6-10002-gcc-4.6-sense_buffer.patch -Patch11000: linux-2.6-11000-gcc-4.6.patch +Patch10003: linux-2.6-10003-gcc-4.6-vdso.patch +Patch10004: linux-2.6-10004-gcc-4.6-perf.patch +Patch10911: linux-2.6-10911-perftools-f8-build.patch # empty final patch file to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -977,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 @@ -1001,7 +1005,9 @@ ApplyPatch linux-2.6-680-htb-hysteresis-tso.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 -ApplyPatch linux-2.6-11000-gcc-4.6.patch +ApplyPatch linux-2.6-10003-gcc-4.6-vdso.patch +ApplyPatch linux-2.6-10004-gcc-4.6-perf.patch +ApplyPatch linux-2.6-10911-perftools-f8-build.patch #### Planet-Lab #### ApplyOptionalPatch linux-kernel-test.patch @@ -1138,6 +1144,11 @@ BuildKernel() { sed -i -e "s:-Wno-array-bounds -Werror:-Wno-array-bounds:g" Makefile #### Planet-Lab #### + #### Planet-Lab #### + # -Werror breaks F16 builds in tools/perf + sed -i -e "s: -Werror : :g" tools/perf/Makefile + #### Planet-Lab #### + # and now to start the build process make -s mrproper @@ -1737,7 +1748,9 @@ fi /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\ %endif\ /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\ +%if %{with_firmware}\ /lib/firmware/*\ +%endif\ %if %{with_dracut}\ %ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\ %else\ @@ -1782,6 +1795,41 @@ 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 + +* Wed Oct 05 2011 Sapan Bhatia - linux-2.6-32-26 +- Tweak to the f8 build-fixing patch + +* Tue Oct 04 2011 Sapan Bhatia - linux-2.6-32-25 +- Apply f8-build-fixing patch + +* Mon Aug 15 2011 Thierry Parmentelat - linux-2.6-32-24 +- fix patch filename + +* Tue Aug 09 2011 Sapan Bhatia - linux-2.6-32-23 +- The option commented out in this patch braeks the build on f8. + +* Thu Jul 07 2011 Thierry Parmentelat - linux-2.6-32-22 +- fixed specfile for --without firmware + +* Fri Jun 10 2011 Thierry Parmentelat - linux-2.6-32-21 +- build tweaks for gcc-4.6 on f15 + * Thu Jun 02 2011 S.Çağlar Onur - linux-2.6-32-20 - fix spec file