X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=1a1dde9ccdad0f14fc6ea9bdb8678f5b83fe47eb;hb=7aaeffe221d50217038450227d7f467015ec230f;hp=b2d516223a3f98a6217099be710c5fe47cf0863f;hpb=0c41ca5b6b49b67e5c8828607fc826a8d31af2bb;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index b2d516223..1a1dde9cc 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -10,9 +10,15 @@ URL: %{SCMURL} %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 11 +%define taglevel 14 %define sublevel 32 + +%if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6) +%define modern_distro 1 +%else +%define modern_distro 0 +%endif #### Planet-Lab #### Summary: The Linux kernel @@ -34,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 #### @@ -51,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 @@ -134,7 +140,7 @@ Summary: The Linux kernel %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1} #### Planet-Lab #### # Use dracut instead of mkinitrd for initrd image generation -%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 +%if %{modern_distro} %define with_dracut %{?_without_dracut: 0} %{?!_without_dracut: 1} %else %define with_dracut %{?_without_dracut: 1} %{?!_without_dracut: 0} @@ -199,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 @@ -463,7 +469,7 @@ Summary: The Linux kernel # integration in the distro harder than needed. # #### Planet-Lab #### -%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 +%if %{modern_distro} %define package_conflicts initscripts < 7.23, udev < 145-11, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3 %else %define package_conflicts initscripts < 7.23, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3 @@ -492,7 +498,7 @@ Summary: The Linux kernel # scripts use them. # #### Planet-Lab #### -%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 +%if %{modern_distro} %define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.4-1 %else %define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, @@ -503,7 +509,7 @@ Summary: The Linux kernel %define initrd_prereq dracut-kernel >= 002-18.git413bcf78 %else #### Planet-Lab #### -%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 +%if %{modern_distro} %define initrd_prereq mkinitrd >= 6.0.61-1 %else %define initrd_prereq mkinitrd >= 5.1 @@ -566,11 +572,7 @@ BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config #### Planet-Lab #### -%if "%{distro}" == "Fedora" && %{distrorelease} >= 14 -BuildRequires: net-tools, patchutils, rpm-build >= 4.8.0-7 -%else BuildRequires: net-tools, patchutils, rpm-build -%endif #### Planet-Lab #### %if %{with_doc} BuildRequires: xmlto @@ -603,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 @@ -663,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 @@ -959,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 @@ -1556,13 +1558,13 @@ fi\ %if %{with_dracut}\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --dracut --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\ %else\ -%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\ +%if %{modern_distro}\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\ %else\ /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}%{?1:.%{1}} || exit $?\ %endif\ %endif}\ -%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\ +%if %{modern_distro}\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\ if [ -x /sbin/weak-modules ]\ then\ @@ -1782,6 +1784,18 @@ fi %endif %changelog +* Wed Mar 16 2011 S.Çağlar Onur - linux-2.6-32-14 +- Do not enable CONFIG_SYSFS_DEPRECATED* options for Scientific Linux + +* Thu Mar 10 2011 S.Çağlar Onur - linux-2.6-32-13 +- bump to 2.6.32-71.18.2.el6, see https://rhn.redhat.com/errata/RHSA-2011-0329.html + +* 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 + * 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]