git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4b12d4b)
keep track of branches
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Mar 2009 12:09:36 +0000 (12:09 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 24 Mar 2009 12:09:36 +0000 (12:09 +0000)
modules.list patch | blob | history
onelab-tags.mk patch | blob | history
planetbridge-tags.mk patch | blob | history

diff --git a/modules.list b/modules.list
index a8e5e10..20678ad 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -19,8 +19,8 @@ inotify-tools
 iproute2
 iptables
 libnl
 iproute2
 iptables
 libnl
-linux-2.6:22
 linux-2.6
 linux-2.6
+linux-2.6:22
 madwifi
 nodeconfig
 nozomi
 madwifi
 nodeconfig
 nozomi
diff --git a/onelab-tags.mk b/onelab-tags.mk
index 4d17374..7298f51 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -2,6 +2,7 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
 
 # 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/branches/22
 #linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/branches/22
 #linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk
index 9480d04..52c4f3b 100644 (file)
--- a/planetbridge-tags.mk
+++ b/planetbridge-tags.mk
@@ -2,6 +2,7 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
 
 # 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/branches/22
 #linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/branches/22
 #linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
build