X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=6f21d2855527169ee0cb50d32575f83d0bf4611d;hb=refs%2Fheads%2F22;hp=99433e73295b9b6f88648f4d7df7f5657d39a543;hpb=c6b459ba9d7e73b72cfafde0dee053b56a19e5ba;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 99433e732..6f21d2855 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,18 +9,27 @@ Summary: The Linux kernel (the core of the Linux operating system) %define builddoc 0 %define headers 1 +%{!?pldistro:%global pldistro planetlab} + # 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} +%{!?iwlwifi:%global iwlwifi 0} + +# 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 42 +%define taglevel 50 # # Polite request for people who spin their own kernel rpms: @@ -44,18 +48,19 @@ 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 updatelevel 1 +%define requiresreboot 0 -%define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}%{?updatelevel:.%{updatelevel}} +%define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define packagerelease %{kernelrelease} - - -%{!?pldistro:%global pldistro planetlab} - %define signmodules 0 %define make_target bzImage + +#%if "%{distro}" == "Fedora" && %{distrorelease} >= 13 +#%define KVERREL %{version}-%{kernelrelease} +#%else %define KVERREL %{PACKAGE_VERSION}-%{kernelrelease} +#%endif # Override generic defaults with per-arch defaults @@ -103,7 +108,7 @@ Summary: The Linux kernel (the core of the Linux operating system) Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} Name: kernel Group: System Environment/Kernel @@ -136,13 +141,13 @@ 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 @@ -152,6 +157,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2 Patch010: linux-2.6-010-e1000e.patch Patch015: linux-2.6-015-igb.patch +Patch017: linux-2.6-017-bnx2.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 @@ -161,6 +167,7 @@ Patch050: linux-2.6-050-getline.patch Patch100: linux-2.6-100-build-nonintconfig.patch Patch150: linux-2.6-150-cciss-allow-kexec-to-work.patch +Patch151: linux-2.6-151-cciss-SAS.patch # Linux-VServer Patch200: patch-%{rpmversion}-vs%{vsversion}.diff @@ -208,10 +215,17 @@ Patch722: linux-2.6-722-bonding-rr.patch Patch800: linux-2.6-800-fix-4-bit-apicid-assumption.patch +Patch810: linux-2.6-810-ich10.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 + +Patch950: linux-2.6.950-ext3_backports.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} +%if %{iwlwifi} %define mac80211_version 10.0.4 Patch600: http://intellinuxwireless.org/mac80211/downloads/mac80211-%{mac80211_version}.tgz %define iwlwifi_version 1.2.25 @@ -224,7 +238,8 @@ BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root 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. +input and output, etc. +Configured with kernelconfig=%{kernelconfig} and iwlwifi=%{iwlwifi} %package devel Summary: Development package for building kernel modules to match the kernel. @@ -354,7 +369,7 @@ else cd kernel-%{kversion} fi -%if "0%{updatelevel}" +%if %{requiresreboot} echo "This is a trivial maintenance update. There will be no reboot following installation." %endif @@ -384,6 +399,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 10 %ApplyPatch 15 +%ApplyPatch 17 %ApplyPatch 20 # NetNS patch for VINI @@ -396,6 +412,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 100 %ApplyPatch 150 +%ApplyPatch 151 %ApplyPatch 200 %ApplyPatch 210 @@ -439,7 +456,12 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 721 %ApplyPatch 722 %ApplyPatch 800 +%ApplyPatch 810 + +%ApplyPatch 900 +%ApplyPatch 910 +%ApplyPatch 950 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may # break with later patches. @@ -448,7 +470,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch %vini_pl_patch %endif -%if %{build_iwlwifi} +%if %{iwlwifi} # Run the mac80211 stuff in the kernel tree holding the last patch tar -xzf %{PATCH600} pushd mac80211-%{mac80211_version} @@ -502,11 +524,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 @@ -532,9 +554,10 @@ BuildKernel() { 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}* + rm -rf $RPM_BUILD_ROOT/usr/include/scsi %endif -%if %{build_iwlwifi} +%if %{iwlwifi} # build the iwlwifi driver make -C %{_builddir}/kernel-%{kversion}/iwlwifi-%{iwlwifi_version} ARCH=$Arch \ KSRC=%{_builddir}/kernel-%{kversion}/linux-%{_target_cpu}-%{kversion}$Flavour @@ -561,7 +584,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} +%if %{iwlwifi} # install iwlwifi # make -C %{_builddir}/kernel-%{kversion}/iwlwifi-%{iwlwifi_version} ARCH=$Arch \ # KSRC=%{_builddir}/kernel-%{kversion}/linux-%{_target_cpu}-%{kversion}$Flavour \ @@ -788,10 +811,9 @@ pushd /boot > /dev/null ; { } popd > /dev/null +%if %{requiresreboot} # ask for a reboot mkdir -p /etc/planetlab - -%if "%{updatelevel}"=="" touch /etc/planetlab/update-reboot %endif @@ -916,6 +938,37 @@ rm -f /lib/modules/%{KVERREL}uml/modules.* %endif %changelog +* Mon Jan 24 2011 Thierry Parmentelat - linux-2.6-22-50 +- no semantic change - just fixed specfile for git URL, and pull from onelab.eu + +* Fri May 07 2010 S.Çağlar Onur - linux-2.6-22-48 +- Support next generation of HP Smart Array SAS/SATA controllers + +* Thu Apr 15 2010 S.Çağlar Onur - linux-2.6-22-47 +- Tagging 22 branch with following changes; +- * Make barrier=1 for ext3 filesystem, +- * Support barriers on single device dm devices, +- * Introduce various ext3 related fixes, +- * Fix conflict between glibc-headers kernel-headers packages + +* Tue Mar 16 2010 S.Çağlar Onur - linux-2.6-22-46 +- every released package should have a tag in svn, so remove updatelevel from naming scheme and also change the variable name + +* Tue Mar 16 2010 S.Çağlar Onur - linux-2.6-22-45 +- add support for ICH10 + +* Fri Feb 19 2010 S.Çağlar Onur - linux-2.6-22-44 +- Disable rebooting + +* Fri Feb 05 2010 S.Çağlar Onur - linux-2.6-22-43 +- Tagging 22 branch with following changes; +- * new e1000 driver, +- * VXC_PROC_WRITE support, +- * Bonding and multipath support, +- * IGB driver support, +- * Boot fix for the HP DL320 G6 boxes, +- * Kexec fix for CCISS controllers, + * Fri Jun 26 2009 Daniel Hokka Zakrisson - linux-2.6-22-42 - Bonding and multipath things.