Trellis branch of the kernel

[linux-2.6.git] / kernel-2.6-planetlab.spec

diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec
index 6c743b9..f1a02bc 100644 (file)
--- a/kernel-2.6-planetlab.spec
+++ b/kernel-2.6-planetlab.spec
@@ -25,7 +25,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 # Will go away when VServer supports NetNS in mainline. Currently, it must be 
 # updated every time the PL kernel is updated.
-%define vini_pl_patch 551
+%define vini_pl_patch 561
 
 %define specrelease 1
 
@@ -129,6 +129,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
 
 Patch010: linux-2.6-010-e1000e.patch
 Patch020: linux-2.6-020-build-id.patch
+Patch030: linux-2.6-030-netns.patch
 
 # These are patches picked up from Fedora/RHEL
 Patch100: linux-2.6-100-build-nonintconfig.patch
@@ -146,6 +147,8 @@ Patch520: linux-2.6-520-vnet+.patch
 Patch530: linux-2.6-530-built-by-support.patch
 Patch540: linux-2.6-540-oom-kill.patch
 Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
+Patch560: linux-2.6-560-mmconf.patch
+Patch570: linux-2.6-570-tagxid.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -305,7 +308,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 20
 
 # NetNS patch for VINI
-%if 0%{?_with_netns}
+%if 0%{?with_netns}
 %ApplyPatch 30
 %endif
 
@@ -321,11 +324,13 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 530
 %ApplyPatch 540
 %ApplyPatch 550
+%ApplyPatch 560
+%ApplyPatch 570
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
 
-%if 0%{?_with_netns}
+%if 0%{?with_netns}
 %ApplyPatch %vini_pl_patch
 %endif