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
adjust planetlab patchset against RHEL kernel
[linux-2.6.git]
/
kernel.spec
diff --git
a/kernel.spec
b/kernel.spec
index
3a0eab1
..
028efda
100644
(file)
--- a/
kernel.spec
+++ b/
kernel.spec
@@
-99,7
+99,7
@@
Summary: The Linux kernel
# kernel-headers
%define with_headers %{?_without_headers: 0} %{?!_without_headers: 1}
# kernel-firmware
# kernel-headers
%define with_headers %{?_without_headers: 0} %{?!_without_headers: 1}
# kernel-firmware
-%define with_firmware %{?_with_firmware:
1} %{?!_with_firmware: 0
}
+%define with_firmware %{?_with_firmware:
0} %{?!_with_firmware: 1
}
# tools/perf
%define with_perftool %{?_without_perftool: 0} %{?!_without_perftool: 1}
# perf noarch subpkg
# tools/perf
%define with_perftool %{?_without_perftool: 0} %{?!_without_perftool: 1}
# perf noarch subpkg
@@
-1851,6
+1851,9
@@
Patch1237: mm-Switch-to-SLAB.patch
Patch1238: redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
Patch88888: patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
Patch1238: redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
Patch88888: patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
+Patch90250: linux-2.6-250-ipsets.patch
+Patch90510: linux-2.6-510-ipod.patch
+Patch90521: linux-2.6-521-packet-tagging.patch
# empty final patch file to facilitate testing of kernel patches
Patch99999: linux-kernel-test.patch
# empty final patch file to facilitate testing of kernel patches
Patch99999: linux-kernel-test.patch
@@
-3469,6
+3472,9
@@
ApplyPatch mm-Switch-to-SLAB.patch
ApplyPatch redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
ApplyPatch patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
ApplyPatch redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
ApplyPatch patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
+ApplyPatch linux-2.6-250-ipsets.patch
+ApplyPatch linux-2.6-510-ipod.patch
+ApplyPatch linux-2.6-521-packet-tagging.patch
ApplyOptionalPatch linux-kernel-test.patch
ApplyOptionalPatch linux-kernel-test.patch