X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=7246e64db1ccf4966574ab631efe34c7962bed59;hb=cea1b277201577d311ca56d236f017e1ce977cbd;hp=03311006e45951ec9a5ed8d7b2fcfe32fae09fd5;hpb=be045a194eb6c82c66a4d4b9fcc7986d0e1e417a;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 03311006e..7246e64db 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 20
+%define taglevel 22
 
 %define sublevel 32
 
@@ -685,7 +685,8 @@ 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
-Patch11000: linux-2.6-11000-gcc-4.6.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
 
@@ -1001,7 +1002,8 @@ 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-11000-gcc-4.6.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
@@ -1737,7 +1739,9 @@ fi
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
+%if %{with_firmware}\
 /lib/firmware/*\
+%endif\
 %if %{with_dracut}\
 %ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
@@ -1782,6 +1786,12 @@ fi
 %endif
 
 %changelog
+* Thu Jul 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-22
+- fixed specfile for --without firmware
+
+* 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