X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=99acf8cb0bcd629515c789a3b8378be6dde4364f;hb=d8b145b86f6f4b685b56ccaef7e9f5a6d4e21a9f;hp=48e9eae24a39985b8b1ae0178e3f3fe050dc12ca;hpb=920f2c3d5585eab6b8727b9f96a143fc1e500035;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 48e9eae24..99acf8cb0 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,7 +10,7 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 9
+%define taglevel 10
 
 %define sublevel 32
 #### Planet-Lab ####
@@ -111,7 +111,7 @@ Summary: The Linux kernel
 # kernel-kdump
 %define with_kdump     %{?_without_kdump:     0} %{?!_without_kdump:     1}
 # kernel-debug
-%define with_debug     %{?_with_debug:	      1} %{?!_with_debug:        0}
+%define with_debug     %{?_without_debug:     1} %{?!_without_debug:     0}
 # kernel-doc
 %define with_doc       %{?_without_doc:       0} %{?!_without_doc:       1}
 # kernel-headers
@@ -126,19 +126,7 @@ Summary: The Linux kernel
 %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
-%if "%{distroname}" == "f14"
-# for now, spec2make does not understand --with or --define options
-# I'm hard-coding this for now
-%define with_debuginfo 0
-%define with_debug 0
-%define with_doc 0
-%else
-%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
-%endif
-%endif
 #### Planet-Lab ####
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
@@ -505,9 +493,9 @@ Summary: The Linux kernel
 #
 #### 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
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.4-1
 %else
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, 
 %endif
 #### Planet-Lab ####
 
@@ -1568,7 +1556,11 @@ fi\
 %if %{with_dracut}\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --dracut --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\
 %else\
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\
+%else\
+/sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}%{?1:.%{1}} || exit $?\
+%endif\
 %endif}\
 %if "%{distro}" == "Fedora" && %{distrorelease} >= 12\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\
@@ -1674,12 +1666,14 @@ fi
 /usr/include/*
 %endif
 
+%if 0
 %if %{with_firmware}
 %files firmware
 %defattr(-,root,root)
 /lib/firmware/*
 %doc linux-%{kversion}.%{_target_cpu}/firmware/WHENCE
 %endif
+%endif
 
 %if %{with_bootwrapper}
 %files bootwrapper
@@ -1743,6 +1737,7 @@ fi
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
+/lib/firmware/*\
 %if %{with_dracut}\
 %ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
@@ -1787,6 +1782,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 25 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-10
+- disable debug and debuginfo packages for all flavors. Also incorporate kernel-firmware package's content into kernel RPM.
+
 * Wed Jan 12 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-9
 - bump to kernel-2.6.32-71.14.1.el6, see https://rhn.redhat.com/errata/RHSA-2011-0007.html for details