From: S.Çağlar Onur Date: Thu, 10 Mar 2011 17:02:52 +0000 (-0500) Subject: bump to 2.6.32-71.18.2.el6, see https://rhn.redhat.com/errata/RHSA-2011-0329.html X-Git-Tag: linux-2.6-32-13~1 X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=d1681496c48340b05e3132c4d2b54eefa0e58695 bump to 2.6.32-71.18.2.el6, see https://rhn.redhat.com/errata/RHSA-2011-0329.html --- diff --git a/kernel-2.6.spec b/kernel-2.6.spec index b8b62b534..cfb68b764 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -40,7 +40,7 @@ Summary: The Linux kernel %define rhel 1 %if %{rhel} -%define distro_build 71.18.1 +%define distro_build 71.18.2 #### Planet-Lab #### %define signmodules 0 #### Planet-Lab #### @@ -57,7 +57,7 @@ Summary: The Linux kernel # Don't stare at the awk too long, you'll go blind. %define fedora_cvs_origin 1462 %define fedora_cvs_revision() %2 -%global distro_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision: 1.18.2.18 $} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }') +%global distro_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision: 1.18.2.19 $} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }') %define distro_build %{fedora_build} %define signmodules 0 %endif @@ -205,7 +205,7 @@ Summary: The Linux kernel %endif # The kernel tarball/base version -%define kversion 2.6.32-71.18.1.el6 +%define kversion 2.6.32-71.18.2.el6 %define make_target bzImage @@ -605,7 +605,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 7Gb %define debuginfo_args --strict-build-id %endif -Source0: linux-2.6.32-71.18.1.el6.tar.bz2 +Source0: linux-2.6.32-71.18.2.el6.tar.bz2 Source1: Makefile.common @@ -665,7 +665,7 @@ Source79: config-debug-rhel Source80: config-generic-rhel Source81: config-powerpc64 -Patch1: patch-2.6.32-71.18.1.el6-vs2.3.0.36.29.4.diff +Patch1: patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff Patch2: linux-2.6-220-delta-ptrace-fix01.patch Patch3: linux-2.6-250-ipsets.patch Patch4: linux-2.6-510-ipod.patch @@ -961,7 +961,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} . make -f %{SOURCE20} VERSION=%{version} configs #### Planet-Lab #### -ApplyPatch patch-2.6.32-71.18.1.el6-vs2.3.0.36.29.4.diff +ApplyPatch patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch ApplyPatch linux-2.6-250-ipsets.patch ApplyPatch linux-2.6-510-ipod.patch @@ -1784,6 +1784,9 @@ fi %endif %changelog +* Wed Mar 2 2011 Frantisek Hrbata [2.6.32-71.18.2.el6] +- [fs] sunrpc: Correct a misapplied patch (J. Bruce Fields) [678094 678146] + * Wed Feb 23 2011 S.Çağlar Onur - linux-2.6-32-12 - bump to 2.6.32-71.18.1.el6, see https://rhn.redhat.com/errata/RHSA-2011-0283.html diff --git a/original/kernel.spec b/original/kernel.spec index f73391865..cdbce1a92 100644 --- a/original/kernel.spec +++ b/original/kernel.spec @@ -19,7 +19,7 @@ Summary: The Linux kernel %define rhel 1 %if %{rhel} -%define distro_build 71.18.1 +%define distro_build 71.18.2 %define signmodules 1 %else # fedora_build defines which build revision of this kernel version we're @@ -34,7 +34,7 @@ Summary: The Linux kernel # Don't stare at the awk too long, you'll go blind. %define fedora_cvs_origin 1462 %define fedora_cvs_revision() %2 -%global distro_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision: 1.18.2.18 $} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }') +%global distro_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision: 1.18.2.19 $} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }') %define distro_build %{fedora_build} %define signmodules 0 %endif @@ -170,7 +170,7 @@ Summary: The Linux kernel %endif # The kernel tarball/base version -%define kversion 2.6.32-71.18.1.el6 +%define kversion 2.6.32-71.18.2.el6 %define make_target bzImage @@ -544,7 +544,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 7Gb %define debuginfo_args --strict-build-id %endif -Source0: linux-2.6.32-71.18.1.el6.tar.bz2 +Source0: linux-2.6.32-71.18.2.el6.tar.bz2 Source1: Makefile.common @@ -1652,6 +1652,9 @@ fi %endif %changelog +* Wed Mar 2 2011 Frantisek Hrbata [2.6.32-71.18.2.el6] +- [fs] sunrpc: Correct a misapplied patch (J. Bruce Fields) [678094 678146] + * Wed Feb 2 2011 Frantisek Hrbata [2.6.32-71.18.1.el6] - [netdrv] ixgbe: make sure FCoE DDP user buffers are really released by the HW (Frantisek Hrbata) [674002 617193] - [netdrv] ixgbe: invalidate FCoE DDP context when no error status is available (Frantisek Hrbata) [674002 617193] diff --git a/sources b/sources index 238079130..d540e49a2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9ccf9cded3363f02bbe3322b7f0b92cfc5041578 http://build.planet-lab.org/third-party/kernel-2.6.32-71.18.1.el6.src.rpm -22d196bf39618825b2350c24f6836440bb2a8743 http://build.planet-lab.org/third-party/patch-2.6.32-71.18.1.el6-vs2.3.0.36.29.4.diff +c56a2812e3b36d2535f09c486126f9c86d525414 http://build.planet-lab.org/third-party/kernel-2.6.32-71.18.2.el6.src.rpm +22d196bf39618825b2350c24f6836440bb2a8743 http://build.planet-lab.org/third-party/patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff