From f6e49f2def8ca4d899bbe35858be8f22ebdf3a04 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 26 Nov 2012 10:08:56 +0100 Subject: [PATCH] settling as many tgs as possible on the lxc tracks --- lxc-openvswitch-tags.mk | 10 +++++----- lxc-tags.mk | 25 ++++++++++++------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/lxc-openvswitch-tags.mk b/lxc-openvswitch-tags.mk index 83cef9cf..8c538911 100644 --- a/lxc-openvswitch-tags.mk +++ b/lxc-openvswitch-tags.mk @@ -1,15 +1,15 @@ # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication -lxcsu-GITPATH := git://git.planet-lab.org/lxcsu.git@master +lxcsu-GITPATH := git://git.planet-lab.org/lxcsu.git@lxcsu-0.2-1 lxctools-BRANCH := openvswitch lxctools-GITPATH := git://git.planet-lab.org/lxctools.git@openvswitch -transforward-GITPATH := git://git.onelab.eu/transforward.git@master +transforward-GITPATH := git://git.onelab.eu/transforward.git@transforward-0.1-2 procprotect-GITPATH := git://git.onelab.eu/procprotect.git@procprotect-0.1-3 ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-20120610-2 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils@master -nodeupdate-BRANCH := openvswitch +plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils@plnode-utils-0.2-1 +nodemanager-BRANCH := openvswitch nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@openvswitch # Trellis-specific NodeManager plugins nodemanager-topo-GITPATH := git://git.planet-lab.org/NodeManager-topo@master @@ -18,6 +18,7 @@ NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/tru pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.planet-lab.org/codemux.git@codemux-0.1-15 fprobe-ulog-GITPATH := git://git.planet-lab.org/fprobe-ulog.git@fprobe-ulog-1.1.4-2 +libvirt-GITPATH := git://git.planet-lab.org/libvirt.git@master pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 mom-GITPATH := git://git.planet-lab.org/mom.git@mom-2.3-5 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 @@ -55,4 +56,3 @@ nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@master myplc-GITPATH := git://git.planet-lab.org/myplc.git@master # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.1-7 -libvirt-GITPATH := git://git.planet-lab.org/libvirt.git@master diff --git a/lxc-tags.mk b/lxc-tags.mk index a763403e..e84ca340 100644 --- a/lxc-tags.mk +++ b/lxc-tags.mk @@ -1,14 +1,14 @@ # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication -lxcsu-GITPATH := git://git.planet-lab.org/lxcsu.git@master -lxctools-GITPATH := git://git.planet-lab.org/lxctools.git@master -transforward-GITPATH := git://git.onelab.eu/transforward.git@master +lxcsu-GITPATH := git://git.planet-lab.org/lxcsu.git@lxcsu-0.2-1 +lxctools-GITPATH := git://git.planet-lab.org/lxctools.git@lxctools-0.9-1 +transforward-GITPATH := git://git.onelab.eu/transforward.git@transforward-0.1-2 procprotect-GITPATH := git://git.onelab.eu/procprotect.git@procprotect-0.1-3 ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-20120610-2 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils@master -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@master +plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils@plnode-utils-0.2-1 +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.1-13 # Trellis-specific NodeManager plugins nodemanager-topo-GITPATH := git://git.planet-lab.org/NodeManager-topo@master NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk @@ -16,17 +16,17 @@ NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/tru pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.planet-lab.org/codemux.git@codemux-0.1-15 fprobe-ulog-GITPATH := git://git.planet-lab.org/fprobe-ulog.git@fprobe-ulog-1.1.4-2 +libvirt-GITPATH := git://git.planet-lab.org/libvirt.git@lxcbuild pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 mom-GITPATH := git://git.planet-lab.org/mom.git@mom-2.3-5 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git@master vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-2 vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-44 -# somehow this won't mirror bind_public-GITPATH := git://git.onelab.eu/bind_public.git@bind_public-0.1-2 -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.1-4 drupal-GITPATH := git://git.planet-lab.org/drupal.git@drupal-4.7-15 -plewww-GITPATH := git://git.planet-lab.org/plewww.git@master +plewww-GITPATH := git://git.planet-lab.org/plewww.git@plewww-4.3-74 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 monitor-GITPATH := git://git.planet-lab.org/monitor@monitor-3.1-6 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 @@ -44,11 +44,10 @@ pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10 pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-15 DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-13 -bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@master -sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@master +bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.1-2 +sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-3 lxc-reference-GITPATH := git://git.planet-lab.org/lxc-reference.git@master -nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@master -myplc-GITPATH := git://git.planet-lab.org/myplc.git@master +nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@nodeimage-2.1-2 +myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.1-4 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.1-7 -libvirt-GITPATH := git://git.planet-lab.org/libvirt.git@lxcbuild -- 2.45.2