From 2c5a8d9ecbd623aa426eef8095e26f8f4993a4db Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 27 Sep 2012 12:39:43 +0200 Subject: [PATCH] update branches to watch --- lxc-openvswitch-tags.mk | 4 ++++ modules.list | 4 ++++ modules.update | 1 + 3 files changed, 9 insertions(+) diff --git a/lxc-openvswitch-tags.mk b/lxc-openvswitch-tags.mk index 270065b0..c23a1e54 100644 --- a/lxc-openvswitch-tags.mk +++ b/lxc-openvswitch-tags.mk @@ -1,6 +1,7 @@ # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication lxcsu-GITPATH := git://git.planet-lab.org/lxcsu.git@master +lxctools-BRANCH := openvswitch lxctools-GITPATH := git://git.planet-lab.org/lxctools.git@openvswitch transforward-GITPATH := git://git.onelab.eu/transforward.git@master procprotect-GITPATH := git://git.onelab.eu/procprotect.git@master @@ -8,6 +9,7 @@ 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 nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@openvswitch # Trellis-specific NodeManager plugins nodemanager-topo-GITPATH := git://git.planet-lab.org/NodeManager-topo@master @@ -41,10 +43,12 @@ nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7 bootmanager-BRANCH := lxc_devel bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@lxc_devel pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10 +pyplnet-BRANCH := openvswitch pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@openvswitch 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-BRANCH := openvswitch sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@openvswitch lxc-reference-GITPATH := git://git.planet-lab.org/lxc-reference.git@master nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@master diff --git a/modules.list b/modules.list index f83df334..7f7f2954 100644 --- a/modules.list +++ b/modules.list @@ -13,6 +13,7 @@ libvirt linux-2.6:32 lxcsu lxctools +lxctools:openvswitch madwifi mom monitor @@ -22,6 +23,7 @@ nodeimage nodemanager nodemanager:2.0 nodeupdate +nodeupdate:openvswitch omf oml pcucontrol @@ -37,9 +39,11 @@ procprotect pyaspects pypcilib pyplnet +pyplnet:openvswitch sfa sface sliceimage +sliceimage:openvswitch sliver-openvswitch tests transforward diff --git a/modules.update b/modules.update index c8a3dda8..f099523f 100755 --- a/modules.update +++ b/modules.update @@ -12,6 +12,7 @@ fcdistros="f14 f16" make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ; make stage1=true PLDISTRO=mlab PLDISTROTAGS=mlab-tags.mk DISTRONAME=${fcdistro} module-tools ; make stage1=true PLDISTRO=lxc PLDISTROTAGS=lxc-tags.mk DISTRONAME=${fcdistro} module-tools ; + make stage1=true PLDISTRO=lxc PLDISTROTAGS=lxc-openvswitch-tags.mk DISTRONAME=${fcdistro} module-tools ; done 2>/dev/null ; echo tests ) | sort -uf | grep -v '^build$' -- 2.43.0