From d9498fc0076ece7c297f32e9b19c16156979affd Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 16 Apr 2012 16:40:07 +0200 Subject: [PATCH] use only tags for rc27 turn off openvswitch in onelab --- onelab-k32-tags.mk | 5 ++--- onelab.mk | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index fe93fce1..160490db 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -28,7 +28,6 @@ fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tag 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-4 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@master vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2 vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-37 plcapi-GITPATH := git://git.planet-lab.org/plcapi.git@plcapi-5.1-1 @@ -51,8 +50,8 @@ bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanag pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11 bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.1-1 -sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@master -nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@master +sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-1 +nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.1-1 myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.1-1 DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 diff --git a/onelab.mk b/onelab.mk index bdaa655a..2efb39dd 100644 --- a/onelab.mk +++ b/onelab.mk @@ -258,17 +258,17 @@ IN_NODEIMAGE += inotify-tools ALL += inotify-tools endif -# -# openvswitch -# -openvswitch-MODULES := openvswitch -openvswitch-SPEC := openvswitch.spec -openvswitch-DEPEND-DEVEL-RPMS += kernel-devel - -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)" -IN_NODEIMAGE += openvswitch -ALL += openvswitch -endif +# # +# # openvswitch +# # +# openvswitch-MODULES := openvswitch +# openvswitch-SPEC := openvswitch.spec +# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel +# +# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)" +# IN_NODEIMAGE += openvswitch +# ALL += openvswitch +# endif # # vsys -- 2.43.0