From 21f399d2cd44286380b194b82cb78e60625e005d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 26 Nov 2007 06:56:38 +0000 Subject: [PATCH] the exploded-tree linux trunk has changed place - thanks daniel --- planetlab-tags.mk | 4 ++-- planetlab.mk | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/planetlab-tags.mk b/planetlab-tags.mk index 4c90aac5..ad0a2d5a 100644 --- 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 91a0d651..c44593bd 100644 --- 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) -- 2.47.0