git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
older modutils do not support --package and --update option
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
9db6435
..
99acf8c
100644
(file)
--- 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 name linux-2.6
%define module_version_varname sublevel
-%define taglevel
9
+%define taglevel
10
%define sublevel 32
#### Planet-Lab ####
%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
# kernel-kdump
%define with_kdump %{?_without_kdump: 0} %{?!_without_kdump: 1}
# kernel-debug
-%define with_debug %{?_without_debug:
0} %{?!_without_debug: 1
}
+%define with_debug %{?_without_debug:
1} %{?!_without_debug: 0
}
# kernel-doc
%define with_doc %{?_without_doc: 0} %{?!_without_doc: 1}
# kernel-headers
# kernel-doc
%define with_doc %{?_without_doc: 0} %{?!_without_doc: 1}
# kernel-headers
@@
-126,15
+126,7
@@
Summary: The Linux kernel
%define with_perf %{?_without_perf: 0} %{?!_without_perf: 1}
#### Planet-Lab ####
# kernel-debuginfo
%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}
%define with_debuginfo %{?_without_debuginfo: 1} %{?!_without_debuginfo: 0}
-%else
-%if "%{distroname}" == "f14"
-%define with_debuginfo %{?_without_debuginfo: 1} %{?!_without_debuginfo: 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}
#### Planet-Lab ####
# kernel-bootwrapper (for creating zImages from kernel + initrd)
%define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
@@
-501,9
+493,9
@@
Summary: The Linux kernel
#
#### Planet-Lab ####
%if "%{distro}" == "Fedora" && %{distrorelease} >= 12
#
#### 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
%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 ####
%endif
#### Planet-Lab ####
@@
-1564,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 %{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 $?\
/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 $?\
%endif}\
%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\
/sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\
@@
-1670,12
+1666,14
@@
fi
/usr/include/*
%endif
/usr/include/*
%endif
+%if 0
%if %{with_firmware}
%files firmware
%defattr(-,root,root)
/lib/firmware/*
%doc linux-%{kversion}.%{_target_cpu}/firmware/WHENCE
%endif
%if %{with_firmware}
%files firmware
%defattr(-,root,root)
/lib/firmware/*
%doc linux-%{kversion}.%{_target_cpu}/firmware/WHENCE
%endif
+%endif
%if %{with_bootwrapper}
%files bootwrapper
%if %{with_bootwrapper}
%files bootwrapper
@@
-1739,6
+1737,7
@@
fi
/etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
%endif\
/lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
/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\
%if %{with_dracut}\
%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
%else\
@@
-1783,6
+1782,9
@@
fi
%endif
%changelog
%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
* 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