X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=3c3a993c192ac91f3d7056e73c9c668a305bc118;hb=c8ca52fb4110dd9637970010837bfe2b79763144;hp=8b132eefe16515409a85c4194b448d93226e31a6;hpb=39b7c72914c8333f1b73824e4f416fb8294dcea3;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 8b132eefe..3c3a993c1 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -4,13 +4,13 @@ Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} %{!?pldistro:%global pldistro planetlab} %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 1 +%define taglevel 7 %define sublevel 32 #### Planet-Lab #### @@ -124,14 +124,26 @@ Summary: The Linux kernel %define with_perftool %{?_without_perftool: 0} %{?!_without_perftool: 1} # perf noarch subpkg %define with_perf %{?_without_perf: 0} %{?!_without_perf: 1} +#### Planet-Lab #### # kernel-debuginfo +%if "%{distro}" == "CentOS" && %{distrorelease} == 5 +%define with_debuginfo %{?_without_debuginfo: 1} %{?!_without_debuginfo: 0} +%else %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} +%endif +#### Planet-Lab #### # kernel-bootwrapper (for creating zImages from kernel + initrd) %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 +466,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 +495,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 >= 5.1 +%endif +#### Planet-Lab #### %endif # @@ -538,7 +569,13 @@ Obsoletes: kernel-smp BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config +#### Planet-Lab #### +%if "%{distro}" == "Fedora" && %{distrorelease} >= 14 BuildRequires: net-tools, patchutils, rpm-build >= 4.8.0-7 +%else +BuildRequires: net-tools, patchutils, rpm-build +%endif +#### Planet-Lab #### %if %{with_doc} BuildRequires: xmlto BuildRequires: asciidoc @@ -651,6 +688,7 @@ 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 +Patch10000: linux-2.6-10000-gcc-4.5.patch # empty final patch file to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -946,6 +984,7 @@ 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 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch +ApplyPatch linux-2.6-10000-gcc-4.5.patch #### Planet-Lab #### ApplyOptionalPatch linux-kernel-test.patch @@ -1523,11 +1562,23 @@ fi\ %else\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\ %endif}\ +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\ if [ -x /sbin/weak-modules ]\ then\ /sbin/weak-modules --add-kernel %{KVERREL}%{?1:.%{1}} || exit $?\ fi\ +%endif\ +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\ +mkdir -p /etc/planetlab\ +touch /etc/planetlab/update-reboot\ %{nil} # @@ -1728,6 +1779,26 @@ fi %endif %changelog +* Thu Jan 06 2011 S.Çağlar Onur - linux-2.6-32-7 +- Adjust mkinitrd requirement for CentOS 5 + +* Wed Jan 05 2011 S.Çağlar Onur - linux-2.6-32-6 +- Disable debuginfo packages for CentOS 5 + +* Wed Dec 22 2010 S.Çağlar Onur - linux-2.6-32-5 +- Fix problems caused by gcc 4.5.1 on F14 + +* Fri Dec 17 2010 S.Çağlar Onur - linux-2.6-32-4 +- Fix build problems for Fedora 8 and 12 + +* Thu Dec 16 2010 S.Çağlar Onur - linux-2.6-32-3 +- Tweak vserver configs based on Daniel's suggestions +- Add appropriate postinstall steps required by PL nodes +- Tweak dependencies for F8 compatibility + +* 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