X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=39f1d7594b4bf11ac85539b27c7790be73ee5cf3;hb=refs%2Fheads%2F27;hp=cd0bd7b7c19455595d517ae601e7d2c0a6d0d79f;hpb=50bec55ca2a1501f25012a8d2b0093d648da1f16;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index cd0bd7b7c..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. @@ -14,14 +9,21 @@ Summary: The Linux kernel (the core of the Linux operating system) %define builddoc 0 %define headers 1 -# from 2.6.27 iwlwifi in builtin +%{!?pldistro:%global pldistro planetlab} + +# default is to search the config file after pldistro +# e.g. set +# kernel-SPECVARS := kernelconfig=planetlab +# to use the planetlab config from another pldistro +# without having to manage symlinks +%{!?kernelconfig:%global kernelconfig %{pldistro}} # Versions of various parts # 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 4 +%define taglevel 38 # # Polite request for people who spin their own kernel rpms: @@ -30,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 14 +%define patchlevel 57 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}} @@ -40,13 +42,11 @@ Summary: The Linux kernel (the core of the Linux operating system) # updated every time the PL kernel is updated. %define vini_pl_patch 561 -%define release vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} - -%{!?pldistro:%global pldistro planetlab} +%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define signmodules 0 %define make_target bzImage -%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} +%define KVERREL %{version}-%{release} # Override generic defaults with per-arch defaults @@ -88,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 @@ -101,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} @@ -118,31 +127,40 @@ 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 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source11: %{pldistro}-%{kversion}-i686.config -Source12: %{pldistro}-%{kversion}-x86_64.config +Source11: %{kernelconfig}-%{kversion}-i686.config +Source12: %{kernelconfig}-%{kversion}-x86_64.config %if %{builduml} -Source20: %{pldistro}-%{kversion}-i686-uml.config +Source20: %{kernelconfig}-%{kversion}-i686-uml.config %endif %if %{buildxen} -Source30: %{pldistro}-%{kversion}-i686-xenU.config +Source30: %{kernelconfig}-%{kversion}-i686-xenU.config %endif # Mainline patches %if "0%{patchlevel}" Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2 %endif -Patch050: linux-2.6-050-getline.patch + +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 # Linux-VServer 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 @@ -155,7 +173,6 @@ Patch522: linux-2.6-522-iptables-connection-tagging.patch Patch523: linux-2.6-523-raw-sockets.patch Patch524: linux-2.6-524-peercred.patch Patch525: linux-2.6-525-sknid-elevator.patch -# Patch526: linux-2.6-526-tun-tap.patch Patch527: linux-2.6-527-iptables-classify-add-mark.patch Patch530: linux-2.6-530-built-by-support.patch Patch540: linux-2.6-540-oom-kill.patch @@ -165,15 +182,21 @@ Patch570: linux-2.6-570-tagxid.patch Patch580: linux-2.6-580-show-proc-virt.patch Patch590: linux-2.6-590-dcookies-mm.patch Patch591: linux-2.6-591-chopstix-intern.patch -# Patch630: linux-2.6-630-sched-fix.patch Patch640: linux-2.6-640-netlink-audit-hack.patch Patch650: linux-2.6-650-hangcheck-reboot.patch Patch660: linux-2.6-660-nmi-watchdog-default.patch -# Patch680: linux-2.6-680-htb-hysteresis-tso.patch +Patch680: linux-2.6-680-htb-hysteresis-tso.patch # Patch690: linux-2.6-690-web100.patch Patch700: linux-2.6-700-egre.patch Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch +# Ext4 +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 %description @@ -181,6 +204,7 @@ The kernel package contains the Linux kernel (vmlinuz), the core of any Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device input and output, etc. +Configured with kernelconfig=%{kernelconfig} %package devel Summary: Development package for building kernel modules to match the kernel. @@ -189,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 @@ -214,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} @@ -240,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 @@ -261,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 @@ -334,10 +358,20 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 0 %endif -%ApplyPatch 50 +%ApplyPatch 10 +%if 0 +%ApplyPatch 11 +%endif +%ApplyPatch 17 + +%ApplyPatch 100 # vserver patch %ApplyPatch 200 +%ApplyPatch 220 +%ApplyPatch 230 +%ApplyPatch 240 +%ApplyPatch 241 %ApplyPatch 250 @@ -363,9 +397,16 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 640 %ApplyPatch 650 %ApplyPatch 660 +%ApplyPatch 680 %ApplyPatch 700 %ApplyPatch 710 +%ApplyPatch 800 + +%if 0 +%ApplyPatch 900 +%ApplyPatch 910 +%endif # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may # break with later patches. @@ -405,11 +446,11 @@ BuildKernel() { # Pick the right config file for the kernel we're building if [ -n "$Flavour" ] ; then - Config=%{pldistro}-%{kversion}-%{_target_cpu}-$Flavour.config + Config=%{kernelconfig}-%{kversion}-%{_target_cpu}-$Flavour.config DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour-%{_target_cpu} DevelLink=/usr/src/kernels/%{KVERREL}$Flavour-%{_target_cpu} else - Config=%{pldistro}-%{kversion}-%{_target_cpu}.config + Config=%{kernelconfig}-%{kversion}-%{_target_cpu}.config DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu} DevelLink= fi @@ -428,7 +469,7 @@ BuildKernel() { #Arch=`head -1 .config | cut -b 3-` echo USING ARCH=$Arch - make -s ARCH=$Arch oldconfig < /dev/null > /dev/null + make -s ARCH=$Arch nonint_oldconfig < /dev/null > /dev/null make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1 %if %{headers} @@ -796,6 +837,112 @@ 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 + +* Wed Jul 14 2010 S.Çağlar Onur - linux-2.6-27-17 +- Enable CONFIG_CGROUP_SCHED instead of CONFIG_USER_SCHED for 64bit kernels + +* Fri Jul 09 2010 S.Çağlar Onur - linux-2.6-27-16 +- support other Broadcom NetXtreme II BCM 5709 dual GbE variants + +* Mon Jul 05 2010 S.Çağlar Onur - linux-2.6-27-15 +- Bump to 2.6.27.48 + +* Tue Jun 15 2010 S.Çağlar Onur - linux-2.6-27-14 +- fix softlock problems that causes kernel panics + +* Thu May 27 2010 S.Çağlar Onur - linux-2.6-27-13 +- Bump to 2.6.27.47 + +* Wed May 05 2010 S.Çağlar Onur - linux-2.6-27-12 +- support 82567LM-3 Gigabit Network devices + +* Wed May 05 2010 S.Çağlar Onur - linux-2.6-27-11 +- Drop VServer version string from package name otherwise RPM refuses to upgrade to newer tagged version saying that 0.36.8.9 > 0.36.4.10 + +* Tue May 04 2010 S.Çağlar Onur - linux-2.6-27-10 +- Revert to vs2.3.0.36.4 + +* Tue Apr 27 2010 Thierry Parmentelat - linux-2.6-27-9 +- config for wextoolbox OK +- upgrade to patch-2.6.27.46-vs2.3.0.36.8 +- turn off delta-pivot-fix01.diff (which was tweaked btw) + +* Wed Apr 07 2010 S.Çağlar Onur - linux-2.6-27-8 +- chopstix fixes & cleanups + +* Fri Apr 02 2010 S.Çağlar Onur - linux-2.6-27-7 +- Update to 2.6.27.46 + +* Mon Feb 15 2010 S.Çağlar Onur - linux-2.6-27-6 +- support Ext4 in order to boot f12 +- fix "vcontext: pivot_root(): Invalid argument errors" while creating a guest with f12 + +* Mon Feb 15 2010 S.Çağlar Onur - linux-2.6-27-5 +- Update to 2.6.27.45 + * Mon Feb 15 2010 S.Çağlar Onur - linux-2.6-27-4 - Tagging trunk