trying out kernel trunk and branches/22 with kernelconfig set

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index e8ac432..0e21198 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -3,7 +3,7 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-6
+linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 ipfwsrc-SVNPATH                 := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-10
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 658d7ab..599903b 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -4,7 +4,7 @@
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
 linux-2.6-SVNBRANCH            := 22
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-44
+linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/branches/22
 ipfwsrc-SVNPATH                 := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-10
 madwifi-SVNBRANCH              := 0.9.4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3

diff --git a/onelab.mk b/onelab.mk
index faf2842..3d34e0b 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -26,7 +26,8 @@ else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
 # this is useful for 2.6.22 but will not be needed anymore with 2.6.27
-kernel-SPECVARS := iwlwifi=1
+kernel-SPECVARS += iwlwifi=1 
+kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
 
 kernels: $(KERNELS)