X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=badd797b46e54a4488e78aa1930b9e58e08dffef;hb=cf5f4d3396f714ce5bd1d7da654e13debaf35544;hp=a7e1350e6f4a4d6d330c7cb7efc98812a6dddbcf;hpb=66dfaf4f8df4499b9ccd9f49c46f661bed43d080;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index a7e1350e6..badd797b4 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -24,7 +24,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 28 +%define taglevel 33 # # Polite request for people who spin their own kernel rpms: @@ -92,6 +92,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 +130,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,14 +177,17 @@ 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" +%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 # See also the file named 'sources' here for the related checksums # NOTE. iwlwifi should be in-kernel starting from 2.6.24 @@ -391,9 +394,11 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 640 %ApplyPatch 650 %ApplyPatch 660 -%if "%{distroname}" == "f9" +%if "%{distroname}" == "f9" || "%{distroname}" == "f10" %ApplyPatch 670 %endif +%ApplyPatch 680 +%ApplyPatch 690 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may @@ -856,6 +861,21 @@ rm -f /lib/modules/%{KVERREL}uml/modules.* %endif %changelog +* 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.