reorganized

diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec
index f1a02bc..2d6c3ad 100644 (file)
--- a/kernel-2.6-planetlab.spec
+++ b/kernel-2.6-planetlab.spec
@@ -10,6 +10,8 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 # Versions of various parts
 
+%define _with_netns 1
+
 #
 # Polite request for people who spin their own kernel rpms:
 # please modify the "release" field in a way that identifies
@@ -307,11 +309,6 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 10
 %ApplyPatch 20
 
-# NetNS patch for VINI
-%if 0%{?with_netns}
-%ApplyPatch 30
-%endif
-
 %ApplyPatch 100
 
 %ApplyPatch 200
@@ -327,13 +324,15 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 560
 %ApplyPatch 570
 
+# 
+%if 0%{?_with_netns}
+%ApplyPatch 590
+%ApplyPatch 591
+%endif
+
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
 
-%if 0%{?with_netns}
-%ApplyPatch %vini_pl_patch
-%endif
-
 rm -fr linux-%{kversion}
 ln -sf $KERNEL_PREVIOUS linux-%{kversion}
 cd linux-%{kversion}

diff --git a/trellis-mm.patch b/linux-2.6-590-trellis-mm1.patch
similarity index 100%
rename from trellis-mm.patch
rename to linux-2.6-590-trellis-mm1.patch

diff --git a/trellis-netns.patch b/linux-2.6-591-trellis-netns.patch
similarity index 100%
rename from trellis-netns.patch
rename to linux-2.6-591-trellis-netns.patch