X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=39f1d7594b4bf11ac85539b27c7790be73ee5cf3;hb=refs%2Fheads%2F27;hp=fb926061269ef8ce7166bc535326e5640c7fa08e;hpb=1c4700d8d209a22b636ed9435c460a50b0c98e58;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index fb9260612..39f1d7594 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -1,8 +1,3 @@ -# -# $Id$ -# -%define url $URL$ - Summary: The Linux kernel (the core of the Linux operating system) # What parts do we want to build? We must build at least one kernel. @@ -28,7 +23,7 @@ Summary: The Linux kernel (the core of the Linux operating system) # for module-tag.py - sublevel is used for the version (middle) part of tag names %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 18 +%define taglevel 38 # # Polite request for people who spin their own kernel rpms: @@ -37,7 +32,7 @@ Summary: The Linux kernel (the core of the Linux operating system) # adding some text to the end of the version number. # %define sublevel 27 -%define patchlevel 50 +%define patchlevel 57 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}} @@ -51,11 +46,7 @@ Summary: The Linux kernel (the core of the Linux operating system) %define signmodules 0 %define make_target bzImage -#%if "%{distro}" == "Fedora" && %{distrorelease} >= 13 -#%define KVERREL %{version}-%{release} -#%else -%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} -#%endif +%define KVERREL %{version}-%{release} # Override generic defaults with per-arch defaults @@ -97,12 +88,12 @@ Summary: The Linux kernel (the core of the Linux operating system) # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 3.5.5 +%define kernel_requires fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 3.5.5 Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} Name: kernel Group: System Environment/Kernel @@ -110,12 +101,21 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} ExclusiveOS: Linux + +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 +# this is a big and dirty work around for plymouth's dependencies on +# Fedora 12. we don't even need plymouth on nodes. +Provides: kernel = 2.6.29.1 +%else +Provides: kernel = %{version} +%endif + Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-smp = %{rpmversion}-%{release} Provides: kernel-smp-%{_target_cpu} = %{rpmversion}-%{release} -Prereq: %{kernel_prereq} +Requires: %{kernel_requires} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} Conflicts: %{nptl_conflicts} @@ -127,8 +127,8 @@ AutoReqProv: no # # List the packages used during the kernel build # -BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar -BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils +BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar +BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils BuildRequires: gcc >= 3.3.3, binutils >= 2.12, redhat-rpm-config BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -150,6 +150,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2 %endif Patch010: linux-2.6-010-e1000e-ich10lan.patch +#Patch011: linux-2.6-011-e1000e-82574L.patch Patch017: linux-2.6-017-bnx2.patch Patch100: linux-2.6-100-build-nonintconfig.patch @@ -159,6 +160,7 @@ Patch200: patch-%{rpmversion}-vs%{vsversion}.diff Patch220: delta-ptrace-fix01.diff Patch230: delta-pivot-fix01.diff Patch240: delta-killperm-fix01.diff +Patch241: delta-vx_rss_avail.patch # IP sets Patch250: linux-2.6-250-ipsets.patch @@ -193,6 +195,7 @@ Patch800: linux-2.6-800-rename-ext4dev-to-ext4.patch #Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch #Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch +Patch911: linux-2.6-911-perftools-f8-build.patch BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -210,7 +213,7 @@ AutoReqProv: no Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-smp-devel = %{rpmversion}-%{release} Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{release} -Prereq: /usr/bin/find +Requires: /usr/bin/find %description devel This package provides kernel headers and makefiles sufficient to build modules @@ -235,7 +238,7 @@ Summary: The Linux kernel compiled for unprivileged Xen guest VMs Group: System Environment/Kernel Provides: kernel = %{version} Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU -Prereq: %{kernel_prereq} +Requires: %{kernel_requires} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} Conflicts: %{nptl_conflicts} @@ -261,7 +264,7 @@ AutoReqProv: no Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU Provides: kernel-devel = %{rpmversion}-%{release}xenU -Prereq: /usr/sbin/hardlink, /usr/bin/find +Requires: /usr/sbin/hardlink, /usr/bin/find %description xenU-devel This package provides kernel headers and makefiles sufficient to build modules @@ -282,7 +285,7 @@ Provides: kernel-uml-devel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp Provides: kernel-devel = %{rpmversion}-%{release}smp AutoReqProv: no -Prereq: /usr/sbin/hardlink, /usr/bin/find +Requires: /usr/sbin/hardlink, /usr/bin/find %description uml-devel This package provides kernel headers and makefiles sufficient to build modules @@ -356,6 +359,9 @@ KERNEL_PREVIOUS=vanilla %endif %ApplyPatch 10 +%if 0 +%ApplyPatch 11 +%endif %ApplyPatch 17 %ApplyPatch 100 @@ -365,6 +371,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 220 %ApplyPatch 230 %ApplyPatch 240 +%ApplyPatch 241 %ApplyPatch 250 @@ -830,6 +837,67 @@ rm -f /lib/modules/%{KVERREL}uml/modules.* %endif %changelog +* Mon Sep 26 2011 Thierry Parmentelat - linux-2.6-27-38 +- no functional change, just pull the patch file from our mirror + +* Tue Aug 23 2011 Thierry Parmentelat - linux-2.6-27-37 +- fixed patch filename + +* Thu Jul 21 2011 Sapan Bhatia - linux-2.6-27-36 +- This patch fixes an issue that causes Build to fail on f8. + +* Sat Mar 26 2011 S.Çağlar Onur - linux-2.6-27-35 +- Use build-planetlab.prg + +* Mon Jan 24 2011 Thierry Parmentelat - linux-2.6-27-34 +- no semantic change - just fixed specfile for git URL + +* Fri Dec 10 2010 S.Çağlar Onur - linux-2.6-27-33 +- Bump to 2.6.27.57 + +* Thu Dec 02 2010 Thierry Parmentelat - linux-2.6-27-32 +- harmless changes in specfile to build on fedora14 + +* Tue Nov 23 2010 S.Çağlar Onur - linux-2.6-27-31 +- Bump to 2.6.27.56 + +* Thu Nov 18 2010 S.Çağlar Onur - linux-2.6-27-30 +- Boot on Dell R410 +- Enable some config options + +* Fri Oct 29 2010 S.Çağlar Onur - linux-2.6-27-29 +- bump to 2.6.27.55 + +* Tue Oct 05 2010 S.Çağlar Onur - linux-2.6-27-28 +- bump to 2.6.27.54 + +* Fri Sep 24 2010 Baris Metin - linux-2.6-27-27 +- f12 workaround + +* Sun Aug 29 2010 S.Çağlar Onur - linux-2.6-27-26 +- the check_stack_guard_page() has, under certain circumstances, side-effects which can not easily be undone in case the vx_rss_avail() fails + +* Fri Aug 27 2010 S.Çağlar Onur - linux-2.6-27-25 +- Bump to 2.6.27.53 + +* Fri Aug 20 2010 S.Çağlar Onur - linux-2.6-27-24 +- Bump to 2.6.27.52 + +* Wed Aug 18 2010 S.Çağlar Onur - linux-2.6-27-23 +- Pick d7824370e26325c881b665350ce64fb0a4fde24a and 11ac552477e32835cb6970bf0a70c210807f5673 from Linus's tree + +* Sun Aug 15 2010 S.Çağlar Onur - linux-2.6-27-22 +- Test 52-rc2 + +* Fri Aug 13 2010 S.Çağlar Onur - linux-2.6-27-21 +- Bump to 2.6.27.51 and include 2.6.27.51-rc1 patchset to test + +* Wed Aug 11 2010 S.Çağlar Onur - linux-2.6-27-20 +- Fix wrong hash + +* Tue Aug 10 2010 S.Çağlar Onur - linux-2.6-27-19 +- bump to 2.6.27.50 + * Mon Aug 02 2010 S.Çağlar Onur - linux-2.6-27-18 - bump to 2.6.27.49