sync makefiles

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 789a340..581f262 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -2,9 +2,6 @@
 
 ###
 linux-2.6-BRANCH               := rhel6
-# caglar has reached a point beyond tag 1 where the kernel builds 
-# but it looks like gcc-4.5 in f14 is more picky and that breaks on this platform
-# reverting to tag 0 which is very rough but at least lets us check the rest of the system
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-4
 madwifi-GITPATH                        := git://git.onelab.eu/madwifi.git@master
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index a65819e..86906e0 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -1,5 +1,6 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
+linux-2.6-BRANCH               := rhel6
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-4
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@master
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0