# 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/trunk
madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0
-util-vserver-SVNBRANCH := scholz
-util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
+# Trellis is using a modified util-vserver and util-vserver-pl with the 2.6.27 kernel
+util-vserver-SVNBRANCH := trellis
+util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/branches/trellis
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16
-NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn//NodeUpdate/tags/NodeUpdate-0.5-4
-PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn//PingOfDeath/tags/PingOfDeath-2.2-1
+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-4
+PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
NodeManager-SVNBRANCH := 1.8
-NodeManager-SVNPATH := http://svn.planet-lab.org/svn//NodeManager/tags/NodeManager-1.8-4
-pyplnet-SVNPATH := http://svn.planet-lab.org/svn//pyplnet/tags/pyplnet-4.3-2
-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-13
-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-1
-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
+NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-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-3
+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-13
+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-1
+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-3
-vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-2
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-17
-drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-11
-PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-15
-www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn//www-register-wizard/tags/www-register-wizard-4.3-0
-Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-12
-nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-3
-BootManager-SVNPATH := http://svn.planet-lab.org/svn//BootManager/tags/BootManager-4.3-7
-pypcilib-SVNPATH := http://svn.planet-lab.org/svn//pypcilib/tags/pypcilib-0.2-7
-BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-13
-VserverReference-SVNPATH := http://svn.planet-lab.org/svn//VserverReference/tags/VserverReference-4.2-12
-BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn//BootstrapFS/tags/BootstrapFS-1.0-8
-MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-12
-geniwrapper-SVNPATH := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.2-2
+vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-7
+PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-22
+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-25
+www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1
+Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-20
+nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-4
+BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-11
+pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8
+BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-15
+VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-13
+BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8
+MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21
+sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/trunk
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-5
# locating the right test directory - see make tests_svnpath
tests-SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-2