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
don't try to package /lib/firmware if that was turned off
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
1b4429a
..
4aeabb1
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
19
+%define taglevel
21
%define sublevel 32
%define sublevel 32
@@
-661,7
+661,7
@@
Source81: config-i686-debug-rhel
Source82: config-generic
Source83: config-x86_64-debug-rhel
Source82: config-generic
Source83: config-x86_64-debug-rhel
-Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.
patch
+Patch1: patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.
diff
Patch2: linux-2.6-255-vserver-delta-cow-fix23.patch
Patch3: linux-2.6-250-ipsets.patch
Patch4: linux-2.6-510-ipod.patch
Patch2: linux-2.6-255-vserver-delta-cow-fix23.patch
Patch3: linux-2.6-250-ipsets.patch
Patch4: linux-2.6-510-ipod.patch
@@
-683,6
+683,10
@@
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
Patch20: linux-2.6-680-htb-hysteresis-tso.patch
Patch10000: linux-2.6-10000-gcc-4.5.patch
+Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
+Patch10002: linux-2.6-10002-gcc-4.6-sense_buffer.patch
+Patch10003: linux-2.6-10003-gcc-4.6-vdso.patch
+Patch10004: linux-2.6-10004-gcc-4.6-perf.patch
# empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
# empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
@@
-974,7
+978,7
@@
cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
make -f %{SOURCE20} VERSION=%{version} configs
#### Planet-Lab ####
make -f %{SOURCE20} VERSION=%{version} configs
#### Planet-Lab ####
-ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.
patch
+ApplyPatch patch-2.6.32-131.0.15.el6-vs2.3.0.36.29.6.
diff
ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.patch
ApplyPatch linux-2.6-250-ipsets.patch
ApplyPatch linux-2.6-510-ipod.patch
ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.patch
ApplyPatch linux-2.6-250-ipsets.patch
ApplyPatch linux-2.6-510-ipod.patch
@@
-996,6
+1000,10
@@
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
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
+ApplyPatch linux-2.6-10001-gcc-4.6-warnoff.patch
+ApplyPatch linux-2.6-10002-gcc-4.6-sense_buffer.patch
+ApplyPatch linux-2.6-10003-gcc-4.6-vdso.patch
+ApplyPatch linux-2.6-10004-gcc-4.6-perf.patch
#### Planet-Lab ####
ApplyOptionalPatch linux-kernel-test.patch
#### Planet-Lab ####
ApplyOptionalPatch linux-kernel-test.patch
@@
-1731,7
+1739,9
@@
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.*\
+%if %{with_firmware}\
/lib/firmware/*\
/lib/firmware/*\
+%endif\
%if %{with_dracut}\
%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
%else\
%if %{with_dracut}\
%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
%else\
@@
-1776,12
+1786,15
@@
fi
%endif
%changelog
%endif
%changelog
+* Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-21
+- build tweaks for gcc-4.6 on f15
+
+* Thu Jun 02 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-20
+- fix spec file
+
* Wed Jun 01 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-19
- bump to 2.6.32-131.0.15.el6, see https://rhn.redhat.com/errata/RHSA-2011-0498.html and https://rhn.redhat.com/errata/RHSA-2011-0542.html
* Wed Jun 01 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-19
- bump to 2.6.32-131.0.15.el6, see https://rhn.redhat.com/errata/RHSA-2011-0498.html and https://rhn.redhat.com/errata/RHSA-2011-0542.html
-* Mon May 23 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-19
-- Fix Ext4 issues
-
* Fri May 20 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-18
- fix read-only ext4 problem when /vserver uses barrier
* Fri May 20 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-18
- fix read-only ext4 problem when /vserver uses barrier