git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 19e1534)
sync tags with onelab & switch to trunk for iptables and util-vserver
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 13 Apr 2010 19:54:38 +0000 (19:54 +0000)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 13 Apr 2010 19:54:38 +0000 (19:54 +0000)
planetlab-k27-tags.mk patch | blob | history

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 23afeaa..4e4f876 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -3,55 +3,53 @@
 
 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 
-# trying the 2.6.27 kernel
-# VINI is running a prototype of a 2.6.27-based PlanetLab node (aka Trellis)
-# Below we include a few Trellis versions of packages 
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-8
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
-# Trellis is using a modified util-vserver and util-vserver-pl with the 2.6.27 kernel
-# this branch is numbered 0.30.216-pre2833 in the specfile
-# initial tag would be util-vserver-0.30.216-pre2833-0
+iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
+iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/trunk
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-# this branch is numbered 0.4 in the specfile
+# Trellis is using a modified util-vserver-pl with the 2.6.27 kernel
 # initial tag would be tags/util-vserver-pl-0.4-3
 util-vserver-pl-SVNBRANCH      := trellis
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-26
-# Trellis-specific NodeManager plugins 
+NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-4
+# Trellis-specific NodeManager plugins
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
-pyplnet-SVNPATH                        := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
-iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
-iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
 vsys-SVNBRANCH                 := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-15
-PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
+PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-5
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-42
+PLEWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-43
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-2
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
-pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2/
-nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7
-BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-17
-pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
-BootCD-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17
-VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16
-BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11
-MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37
-sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10
+pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2
+Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-31
+PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
-PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10
-DistributedRateLimiting-SVNPATH                        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
+###
+pyaspects-SVNPATH              := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3-1
+ejabberd-SVNPATH               := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1
+omf-SVNPATH                    := http://svn.planet-lab.org/svn/omf/tags/omf-5.3-2
+###
+sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10
+nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2
+BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3
+pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
+pyplnet-SVNPATH                        := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5
+BootCD-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1
+VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-2
+BootstrapFS-SVNPATH            := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-4
+MyPLC-SVNPATH                  := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-3
 
 # locating the right test directory - see make tests_svnpath
-tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6
+tests-SVNPATH                  := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-4
build