the exploded-tree linux trunk has changed place - thanks daniel

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 4c90aac..ad0a2d5 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -1,7 +1,7 @@
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
 # see planetlab.mk for when we use one or the other
-Linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/Linux-2.6/trunk
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
+linux-tree-SVNPATH             := http://svn.planet-lab.org/svn/linux-2.6/branches/2.6.20
+linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/trunk
 # 
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/trunk

diff --git a/planetlab.mk b/planetlab.mk
index 91a0d65..c44593b 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -11,11 +11,15 @@
 #
 # kernel
 #
+# until we are able to build the new kernel layout:
+# use the old exploded-tree, 2.6.20-based, version on fc4, 6 & 7
+# and the new one on f8 - that requires the build-id patch
+#
 ifeq "$(RELEASE)" "8"
-kernel-$(HOSTARCH)-MODULES := linux-2.6
+kernel-$(HOSTARCH)-MODULES := linux-patches
 kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
 else
-kernel-$(HOSTARCH)-MODULES := Linux-2.6
+kernel-$(HOSTARCH)-MODULES := linux-tree
 kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
 endif
 ifeq ($(HOSTARCH),i386)