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
8823eef
..
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 2
0
+%define taglevel 2
1
%define sublevel 32
%define sublevel 32
@@
-684,7
+684,9
@@
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
Patch10000: linux-2.6-10000-gcc-4.5.patch
Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
-Patch11000: linux-2.6-11000-gcc-4.6.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
@@
-999,7
+1001,9
@@
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-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-11000-gcc-4.6.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
@@
-1735,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\
@@
-1780,6
+1786,9
@@
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
* Thu Jun 02 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-20
- fix spec file