X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=04dc109c641d91b02f77bb6a70b1c17c5d774130;hb=refs%2Fheads%2Frhel6-mlab;hp=d3cc7ddc0a8b4a069c4319a15a0b7d646ada4ba5;hpb=f91a5aea5e055a52e32d52d1a10f9bad3cca8f6a;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index d3cc7ddc0..04dc109c6 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -10,9 +10,10 @@ URL: %{SCMURL} %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 18 +# 131 borrowed from centos6.1, tg3 from 220 centos 6.2 +%define taglevel 131.vs230.web10027.xidmask.2 -%define sublevel 32 +%define sublevel 33 %if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6) %define modern_distro 1 @@ -232,6 +233,8 @@ Summary: The Linux kernel %define pkg_release %{distro_build}%{?dist}%{?buildid} %endif #### Planet-Lab #### +#%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} @@ -661,7 +664,7 @@ Source81: config-i686-debug-rhel Source82: config-generic Source83: config-x86_64-debug-rhel -Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.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 Patch4: linux-2.6-510-ipod.patch @@ -681,8 +684,17 @@ 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 +Patch22: linux-2.6-700-bcm5720.patch +Patch23: linux-2.6-710-xidmask.patch +Patch24: linux-2.6-720-undo-rttzero.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 +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 @@ -974,7 +986,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} . make -f %{SOURCE20} VERSION=%{version} configs #### Planet-Lab #### -ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.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 ApplyPatch linux-2.6-510-ipod.patch @@ -995,7 +1007,16 @@ 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-700-bcm5720.patch +ApplyPatch linux-2.6-710-xidmask.patch +ApplyPatch linux-2.6-720-undo-rttzero.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-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 @@ -1731,7 +1752,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\ @@ -1776,8 +1799,32 @@ fi %endif %changelog -* Mon May 23 2011 S.Çağlar Onur - linux-2.6-32-19 -- Fix Ext4 issues +* 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 + +* Wed Jun 01 2011 S.Çağlar Onur - linux-2.6-32-19 +- bump to 2.6.32-131.0.15.el6, see https://rhn.redhat.com/errata/RHSA-2011-0498.html and https://rhn.redhat.com/errata/RHSA-2011-0542.html * Fri May 20 2011 S.Çağlar Onur - linux-2.6-32-18 - fix read-only ext4 problem when /vserver uses barrier