From 831c1a478ee953f0b6ca0471c7599116bb6dbe8e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 23 Nov 2007 09:05:12 +0000 Subject: [PATCH] linux-2.6 and Linux-2.6 have different paths to specfile --- planetlab-tags.mk | 7 +++---- planetlab.mk | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/planetlab-tags.mk b/planetlab-tags.mk index 35960cd5..4c90aac5 100644 --- 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 a100aa0d..91a0d651 100644 --- 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 -- 2.43.0