X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=9b2bd093da600bb3d51cea0e47bba22518731a86;hb=refs%2Fheads%2Flibertas;hp=c31877e3b05a0cf06f836f863e5c164727be4501;hpb=2c2ef81ae7ea4e79b5ba8a39f9336684ed261acd;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index c31877e3b..9b2bd093d 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -13,12 +13,18 @@ Summary: The Linux kernel (the core of the Linux operating system) %define buildxen 0 %define builddoc 0 +# default is to not build this - to override, use something like +# kernel-SPECVARS := iwlwifi=1 +# rpm does not seem to have a syntax for defining overridable defaults +# any better solution would be more than welcome. +%define build_iwlwifi %{?iwlwifi:1}%{!?iwlwifi:0} + # 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 1 +%define taglevel 12 # # Polite request for people who spin their own kernel rpms: @@ -141,6 +147,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2 Patch010: linux-2.6-010-e1000e.patch Patch020: linux-2.6-020-build-id.patch Patch030: linux-2.6-030-netns.patch +Patch040: linux-2.6-040-i_mutex-check.patch # These are patches picked up from Fedora/RHEL Patch100: linux-2.6-100-build-nonintconfig.patch @@ -148,15 +155,23 @@ Patch100: linux-2.6-100-build-nonintconfig.patch # Linux-VServer Patch200: patch-%{rpmversion}-vs%{vsversion}.diff Patch210: linux-2.6-210-vserver-cpu-sched.patch -Patch220: linux-2.6-220-lback-feat02.diff # IP sets Patch250: linux-2.6-250-ipsets.patch +# Support for libertas olpc driver +Patch300: linux-2.6-300-olpc.patch + # PlanetLab Patch500: linux-2.6-500-vserver-filesharing.patch Patch510: linux-2.6-510-ipod.patch Patch520: linux-2.6-520-vnet+.patch +Patch521: linux-2.6-521-packet-tagging.patch +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 Patch530: linux-2.6-530-built-by-support.patch Patch540: linux-2.6-540-oom-kill.patch Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch @@ -164,14 +179,20 @@ 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 +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 # See also the file named 'sources' here for the related checksums # NOTE. iwlwifi should be in-kernel starting from 2.6.24 # see http://bughost.org/bugzilla/show_bug.cgi?id=1584 +%if %{build_iwlwifi} %define mac80211_version 10.0.4 Patch600: http://intellinuxwireless.org/mac80211/downloads/mac80211-%{mac80211_version}.tgz -%define iwlwifi_version 1.2.23 +%define iwlwifi_version 1.2.25 Patch601: http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-%{iwlwifi_version}.tgz +%endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -334,18 +355,27 @@ KERNEL_PREVIOUS=vanilla %if 0%{?with_netns} %ApplyPatch 30 %endif +%ApplyPatch 40 %ApplyPatch 100 %ApplyPatch 200 %ApplyPatch 210 -%ApplyPatch 220 %ApplyPatch 250 +%ApplyPatch 300 %ApplyPatch 500 %ApplyPatch 510 -%ApplyPatch 520 + +# VNET+ series +%ApplyPatch 521 +%ApplyPatch 522 +%ApplyPatch 523 +%ApplyPatch 524 +%ApplyPatch 525 +%ApplyPatch 526 + %ApplyPatch 530 %ApplyPatch 540 %ApplyPatch 550 @@ -353,6 +383,10 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 570 %ApplyPatch 580 %ApplyPatch 590 +%ApplyPatch 620 +%ApplyPatch 630 +%ApplyPatch 640 +%ApplyPatch 650 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may # break with later patches. @@ -361,6 +395,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch %vini_pl_patch %endif +%if %{build_iwlwifi} # Run the mac80211 stuff in the kernel tree holding the last patch tar -xzf %{PATCH600} pushd mac80211-%{mac80211_version} @@ -381,6 +416,7 @@ module-list: @echo \$(addprefix \$(DIR),\$(addsuffix .ko,\$(list-m))) EOF popd +%endif rm -fr linux-%{kversion} ln -sf $KERNEL_PREVIOUS linux-%{kversion} @@ -440,9 +476,11 @@ BuildKernel() { make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1 +%if %{build_iwlwifi} # build the iwlwifi driver make -C %{_builddir}/kernel-%{kversion}/iwlwifi-%{iwlwifi_version} ARCH=$Arch \ - KSRC=%{_builddir}/kernel-%{kversion}/linux-%{_target_cpu}-%{kversion}$Flavour + KSRC=%{_builddir}/kernel-%{kversion}/linux-%{_target_cpu}-%{kversion}$Flavour +%endif # Start installing the results @@ -465,6 +503,7 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer +%if %{build_iwlwifi} # install iwlwifi # make -C %{_builddir}/kernel-%{kversion}/iwlwifi-%{iwlwifi_version} ARCH=$Arch \ # KSRC=%{_builddir}/kernel-%{kversion}/linux-%{_target_cpu}-%{kversion}$Flavour \ @@ -476,6 +515,7 @@ BuildKernel() { install -d $iwlwifi_dest install -m 644 -c $iwlwifi_modules $iwlwifi_dest popd +%endif # And save the headers/makefiles etc for building modules against # @@ -808,6 +848,56 @@ rm -f /lib/modules/%{KVERREL}uml/modules.* %endif %changelog +* Tue Jul 15 2008 Sapan Bhatia - linux-2.6-22-12 +- * Bugfix in tuntap +- * Attempt to fix TCP-payload-related problems with tcpdump + +* Wed Jul 09 2008 Sapan Bhatia - linux-2.6-22-11 +- * Split up VNET+ module into its component patches +- * Added tun/tap support + +* Tue Jul 08 2008 Daniel Hokka Zakrisson - linux-2.6-22-10 +- Filling a statically allocated buffer cannot fail, right? + +* Wed Jun 25 2008 Daniel Hokka Zakrisson - linux-2.6-22-9 +- Enable the hangcheck timer driver, and build it in to the kernel. +- Dump relevant data on the scheduler bug instead of BUGing. + +* Sat Jun 07 2008 Sapan Bhatia - linux-2.6-22-8 +- * Partial fix for the UDP-packet-pollution problem +- * Support for PF_PACKET sockets +- * Support for SOCK_PACKET sockets +- * Disabled Chopstix with mutexes +- * Tested VNET+ under heavy loads +- +- + +* Fri May 16 2008 Stephen Soltesz - linux-2.6-22-7 +- Bringing this fix in for tcpdump and ping +- + +* Fri May 09 2008 Stephen Soltesz - linux-2.6-22-6 +- Updated configuration to include COW again. +- +- Patches from Sapan to fix ping losses. +- +- Still need help with tcpdump traffic. +- + +* Tue May 06 2008 Daniel Hokka Zakrisson - linux-2.6-22-5 +- Patch needs to be applied. + +* Mon May 05 2008 Stephen Soltesz - linux-2.6-22-4 +- + +* Thu Apr 24 2008 Thierry Parmentelat - linux-2.6-22-3 +- Fix bug with looping in schedule() + +* Wed Apr 23 2008 Stephen Soltesz - linux-2.6-22-2 +- Includes changes from Sapan/Andy regarding the scheduler and vnet bugs. +- Should be safe to try a second deployment. +- + * Tue Jul 11 2006 Dave Jones [2.6.17-1.2142_FC4] - 2.6.17.4 - Disable split pagetable lock.