X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=86d09f178a8c74c616e0bed23d7af92ac994a173;hb=refs%2Fheads%2Fmpath;hp=af976c79cb890305935cb9a80518ff7eee7e3faa;hpb=554ab4634bbb40f0ea7a4d8bc8b9f8e6ea98cc9f;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index af976c79c..86d09f178 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -12,6 +12,7 @@ Summary: The Linux kernel (the core of the Linux operating system) %define builduml 0 %define buildxen 0 %define builddoc 0 +%define headers 1 # default is to not build this - to override, use something like # kernel-SPECVARS := iwlwifi=1 @@ -24,7 +25,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 23 +%define taglevel 41 # # Polite request for people who spin their own kernel rpms: @@ -92,6 +93,7 @@ Summary: The Linux kernel (the core of the Linux operating system) # scripts use them. # %define kernel_prereq fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 3.5.5 +%define _unpackaged_files_terminate_build 0 Vendor: PlanetLab Packager: PlanetLab Central @@ -129,7 +131,6 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source10: %{pldistro}-%{kversion}-i586.config Source11: %{pldistro}-%{kversion}-i686.config Source12: %{pldistro}-%{kversion}-x86_64.config %if %{builduml} @@ -177,10 +178,23 @@ Patch560: linux-2.6-560-mmconf.patch Patch570: linux-2.6-570-tagxid.patch Patch580: linux-2.6-580-show-proc-virt.patch Patch590: linux-2.6-590-chopstix-intern.patch +Patch592: linux-2.6-592-GC-dcookies-nosleep.patch Patch620: linux-2.6-620-kdb.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 +%if "%{distroname}" == "f9" || "%{distroname}" == "f10" +Patch670: linux-2.6-670-gcc43.patch +%endif +Patch680: linux-2.6-680-htb-hysteresis-tso.patch +Patch690: linux-2.6-690-web100.patch +Patch700: linux-2.6-700-fperm.patch +Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch +# This one is a backport from usptream. +Patch720: linux-2.6-720-bonding-layer23.patch +Patch721: linux-2.6-721-bonding-layer3.patch +Patch722: linux-2.6-722-bonding-rr.patch # See also the file named 'sources' here for the related checksums # NOTE. iwlwifi should be in-kernel starting from 2.6.24 @@ -307,6 +321,12 @@ implicit or explicit dependencies on the "kernel" package (e.g. tcpdump). This package installs no files but provides the necessary dependencies to make rpm and yum happy. +%package headers +Summary: Kernel header +Group: System Environment/Kernel + +%description headers +This package contains the sanitized kernel headers. %prep # First we unpack the kernel tarball. @@ -382,10 +402,21 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 570 %ApplyPatch 580 %ApplyPatch 590 +%ApplyPatch 592 %ApplyPatch 620 %ApplyPatch 630 %ApplyPatch 640 %ApplyPatch 650 +%ApplyPatch 660 +%if "%{distroname}" == "f9" || "%{distroname}" == "f10" +%ApplyPatch 670 +%endif +%ApplyPatch 680 +%ApplyPatch 690 +%ApplyPatch 700 +%ApplyPatch 710 +%ApplyPatch 720 + # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may # break with later patches. @@ -474,6 +505,11 @@ BuildKernel() { make -s ARCH=$Arch nonint_oldconfig > /dev/null make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1 +%if %{headers} + make -s ARCH=$Arch INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr + find $RPM_BUILD_ROOT/%{_includedir} -name \*.cmd -delete + rm -f $RPM_BUILD_ROOT/%{_includedir}/{..,.}{check,install}* +%endif %if %{build_iwlwifi} # build the iwlwifi driver @@ -846,7 +882,70 @@ rm -f /lib/modules/%{KVERREL}uml/modules.* %dir %{_datadir}/doc/kernel-doc-%{kversion} %endif +%if %{headers} +%files headers +%defattr(-,root,root) +%dir %{_includedir} +%{_includedir}/* +%endif + %changelog +* Thu Jun 11 2009 Thierry Parmentelat - linux-2.6-22-41 +- configs for the embedemu pldistro + +* Wed Jun 03 2009 Sapan Bhatia - linux-2.6-22-40 +- Added patch 700, which implements VXC_PROC_WRITE support + +* Tue May 26 2009 Thierry Parmentelat - linux-2.6-22-39 +- outputs the kernel-headers rpm as backported from 2.6.27 + +* Fri May 15 2009 Thierry Parmentelat - linux-2.6-22-38 +- the pcmcia patch needed to be adapted to 2.6.22 + +* Tue May 12 2009 Thierry Parmentelat - linux-2.6-22-37 +- enable patch about 64bits adresses and cardbus + +* Thu Apr 09 2009 Sapan Bhatia - linux-2.6-22-36 +- Inserting this patch, which I missed in the previous tag. + +* Thu Apr 09 2009 Sapan Bhatia - linux-2.6-22-35 +- I missed this hunk in the previous tag. It's disabled by default. + +* Thu Apr 09 2009 Sapan Bhatia - linux-2.6-22-34 +- Tagging after having tested the latest kernel in branch for a couple of days. + +* Mon Feb 23 2009 Sapan Bhatia - linux-2.6-22-33 + +* Thu Jan 08 2009 Thierry Parmentelat - linux-2.6-22-32 +- support building on fedora 10 + +* Tue Dec 02 2008 Daniel Hokka Zakrisson - linux-2.6-22-31 +- add patches for m-lab and drl + +* Tue Nov 11 2008 Daniel Hokka Zakrisson - linux-2.6-22-30 +- Use Intel's e1000e driver. + +* Thu Oct 02 2008 Thierry Parmentelat - linux-2.6-22-29 +- added drivers for OPTION's globetrotter (gt 3g+ emea) umts cards +- + cleanup outdated configs + +* Wed Sep 17 2008 Sapan Bhatia - linux-2.6-22-28 +- Recovering a hunk that I accidentally ommited out of the last commit. Should not entail retesting, because the commits +- were unrelated. + +* Sun Sep 14 2008 Sapan Bhatia - linux-2.6-22-27 +- Fixing the accounting issue that causes certain connections to be misaccounted, and that causes NM/peercreds to +- intermittently break. + +* Wed Sep 10 2008 Thierry Parmentelat - linux-2.6-22-26 +- patch for building on f9/gcc-4.3, no functional change on other distros + +* Sun Aug 17 2008 Daniel Hokka Zakrisson - linux-2.6-22-25 +- FUSE support. + +* Tue Aug 12 2008 Sapan Bhatia - linux-2.6-22-24 +- Enable nmi watchdog by default. + * Mon Aug 04 2008 Sapan Bhatia - linux-2.6-22-23 - Fixed a bug in my previous commit.