X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=9ddaeddabe0429eae544579bfabb96ab2b8c59dc;hb=476c58830d10367faa5cc4b0142f27103654e197;hp=f6a6fbec59b85bc97aa16a734795a586bcd55d94;hpb=d4dccc65c009c7704839bc06737d513289316cff;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index f6a6fbec5..9ddaeddab 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -10,7 +10,7 @@ URL: %(echo %{url} | cut -d ' ' -f 2) %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 1 +%define taglevel 2 %define sublevel 32 #### Planet-Lab #### @@ -130,8 +130,14 @@ Summary: The Linux kernel %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} # Want to build a the vsdo directories installed %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1} +#### Planet-Lab #### # Use dracut instead of mkinitrd for initrd image generation +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 %define with_dracut %{?_without_dracut: 0} %{?!_without_dracut: 1} +%else +%define with_dracut %{?_without_dracut: 1} %{?!_without_dracut: 0} +%endif +#### Planet-Lab #### # Build the kernel-doc package, but don't fail the build if it botches. # Here "true" means "continue" and "false" means "fail the build". @@ -454,7 +460,13 @@ Summary: The Linux kernel # problems with the newer kernel or lack certain things that make # integration in the distro harder than needed. # +#### Planet-Lab #### +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 %define package_conflicts initscripts < 7.23, udev < 145-11, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3 +%else +%define package_conflicts initscripts < 7.23, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3 +%endif +#### Planet-Lab #### # # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok. @@ -477,11 +489,24 @@ Summary: The Linux kernel # Packages that need to be installed before the kernel is, because the %post # scripts use them. # +#### Planet-Lab #### +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 %define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1 +%else +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release} +%endif +#### Planet-Lab #### + %if %{with_dracut} %define initrd_prereq dracut-kernel >= 002-18.git413bcf78 %else +#### Planet-Lab #### +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 %define initrd_prereq mkinitrd >= 6.0.61-1 +%else +%define initrd_prereq mkinitrd >= 6.0.19-1 +%endif +#### Planet-Lab #### %endif # @@ -630,6 +655,27 @@ Source79: config-debug-rhel Source80: config-generic-rhel Source81: config-powerpc64 +Patch1: patch-2.6.32-71.7.1.el6-vs2.3.0.36.29.4.diff +Patch2: linux-2.6-220-delta-ptrace-fix01.patch +Patch3: linux-2.6-250-ipsets.patch +Patch4: linux-2.6-510-ipod.patch +Patch5: linux-2.6-521-packet-tagging.patch +Patch6: linux-2.6-522-iptables-connection-tagging.patch +Patch7: linux-2.6-523-raw-sockets.patch +Patch8: linux-2.6-524-peercred.patch +Patch9: linux-2.6-525-sknid-elevator.patch +Patch10: linux-2.6-527-iptables-classify-add-mark.patch +Patch11: linux-2.6-530-built-by-support.patch +Patch12: linux-2.6-550-raise-default-nfile-ulimit.patch +Patch13: linux-2.6-570-tagxid.patch +Patch14: linux-2.6-580-show-proc-virt.patch +Patch15: linux-2.6-590-dcookies-mm.patch +Patch16: linux-2.6-591-chopstix-intern.patch +Patch17: linux-2.6-640-netlink-audit-hack.patch +Patch18: linux-2.6-650-hangcheck-reboot.patch +Patch19: linux-2.6-660-nmi-watchdog-default.patch +Patch20: linux-2.6-680-htb-hysteresis-tso.patch + # empty final patch file to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -920,8 +966,7 @@ ApplyPatch linux-2.6-550-raise-default-nfile-ulimit.patch ApplyPatch linux-2.6-570-tagxid.patch ApplyPatch linux-2.6-580-show-proc-virt.patch ApplyPatch linux-2.6-590-dcookies-mm.patch -# fails with -Wall build -#ApplyPatch linux-2.6-591-chopstix-intern.patch +ApplyPatch linux-2.6-591-chopstix-intern.patch ApplyPatch linux-2.6-640-netlink-audit-hack.patch ApplyPatch linux-2.6-650-hangcheck-reboot.patch ApplyPatch linux-2.6-660-nmi-watchdog-default.patch @@ -1057,6 +1102,11 @@ BuildKernel() { %endif %endif + #### Planet-Lab #### + # -Werror breaks F14 builds + sed -i -e "s:-Wno-array-bounds -Werror:-Wno-array-bounds:g" Makefile + #### Planet-Lab #### + # and now to start the build process make -s mrproper @@ -1498,11 +1548,32 @@ fi\ %else\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\ %endif}\ +#### Planet-Lab #### +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\ +%endif +#### Planet-Lab #### if [ -x /sbin/weak-modules ]\ then\ /sbin/weak-modules --add-kernel %{KVERREL}%{?1:.%{1}} || exit $?\ fi\ + +#### Planet-Lab #### +# make some useful links +pushd /boot > /dev/null ; { + ln -sf config-%{KVERREL}%{?1:.%{1}} config + ln -sf config-%{KVERREL}%{?1:.%{1}} configsmp + ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-boot + ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-bootsmp + ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-boot + ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-bootsmp +} +popd > /dev/null + +# ask for a reboot +mkdir -p /etc/planetlab +touch /etc/planetlab/update-reboot +#### Planet-Lab #### %{nil} # @@ -1703,6 +1774,9 @@ fi %endif %changelog +* Fri Dec 10 2010 S.Çağlar Onur - linux-2.6-32-2 +- Fix F14 build problems + * Wed Dec 08 2010 S.Çağlar Onur - linux-2.6-32-1 - Bump to latest RHEL6 kernel