refresh branch names

diff --git a/modules.list b/modules.list
index 40438fd..c48ec42 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -12,8 +12,8 @@ ipfw
 iproute2
 iptables
 libnl
 iproute2
 iptables
 libnl

-linux-2.6
-linux-2.6:rhel6
+linux-2.6:27
+linux-2.6:32

 madwifi
 mkinitrd
 Mom
 madwifi
 mkinitrd
 Mom


@@ -38,6 +38,7 @@ pyopenssl
 pypcilib
 pyplnet
 sfa
 pypcilib
 pyplnet
 sfa

+sfa:sqlalchemy

 sface
 tests
 util-vserver
 sface
 tests
 util-vserver

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 00cc2b9..b317c40 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 ###
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 ###

-linux-2.6-BRANCH               := rhel6
+linux-2.6-BRANCH               := 32

 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
 # help out spec2make on f8 and centos5, due to a bug in rpm 
 # ditto on f16 for spec2make.py - tmp hopefully
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
 # help out spec2make on f8 and centos5, due to a bug in rpm 
 # ditto on f16 for spec2make.py - tmp hopefully

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 840d1fe..ec312b5 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -1,5 +1,6 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 

+linux-2.6-BRANCH               := 27

 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-38
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4132-5
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-5
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-38
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4132-5
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-5

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 23c127d..0897bc8 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2

-linux-2.6-BRANCH               := rhel6
+linux-2.6-BRANCH               := 32

 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
 # help out spec2make on f8 and centos5, due to a bug in rpm
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
 # help out spec2make on f8 and centos5, due to a bug in rpm
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"