linux-2.6 and Linux-2.6 have different paths to specfile

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 35960cd..4c90aac 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -1,9 +1,8 @@
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
-ifeq "$(RELEASE)" "8"
-Linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
-else
+# 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
-endif
+linux-2.6-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
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/trunk

diff --git a/planetlab.mk b/planetlab.mk
index a100aa0..91a0d65 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -11,8 +11,13 @@
 #
 # kernel
 #
+ifeq "$(RELEASE)" "8"
+kernel-$(HOSTARCH)-MODULES := linux-2.6
+kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
+else
 kernel-$(HOSTARCH)-MODULES := Linux-2.6
 kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
+endif
 ifeq ($(HOSTARCH),i386)
 kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
 else