From 5227765b6399259b227b5da70234445f0ab42931 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 6 May 2008 07:14:28 +0000 Subject: [PATCH] taking netflow out of the build --- config.planetlab/bootstrapfs.pkgs | 1 - config.planetlab/devel.pkgs | 4 ---- modules.list | 1 - onelab-tags-4.2.mk | 1 - onelab-tags.mk | 1 - onelab.mk | 8 -------- planetlab-tags-4.2.mk | 1 - planetlab-tags.mk | 1 - planetlab.mk | 9 --------- 9 files changed, 27 deletions(-) diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs index d3b3e38c..5b6287fd 100644 --- a/config.planetlab/bootstrapfs.pkgs +++ b/config.planetlab/bootstrapfs.pkgs @@ -127,7 +127,6 @@ package: ipod package: vserver-@pldistro@-@fcdistro@-@arch@ package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@ package: pl_mom -package: netflow-utils package+f8: fprobe-ulog package: vsys package-fc4: vsys diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs index d4871ca0..32797129 100644 --- a/config.planetlab/devel.pkgs +++ b/config.planetlab/devel.pkgs @@ -41,16 +41,12 @@ package+f8: popt-devel # kernel package: gnupg package: diffutils -# util-vserver-pl package: vconfig package: iptables package: wget package: beecrypt-devel package: tetex-latex package: gcc-c++ -#package: util-vserver-lib -#package: util-vserver-devel -#package: util-vserver-core # iptables package: linuxdoc-tools package: sudo diff --git a/modules.list b/modules.list index a73c9323..9eb57aea 100644 --- a/modules.list +++ b/modules.list @@ -12,7 +12,6 @@ PLCAPI:dummynet PLCWWW PLCWWW:onelab.4.2 PingOfDeath -PlanetFlow VserverReference fprobe-ulog iproute2 diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk index cd76b42c..beb38856 100644 --- a/onelab-tags-4.2.mk +++ b/onelab-tags-4.2.mk @@ -23,7 +23,6 @@ CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-10 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-3 # not stable yet pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1 -PlanetFlow-SVNPATH := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-3 Mom-SVNBRANCH := 2.2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-4 iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-1 diff --git a/onelab-tags.mk b/onelab-tags.mk index 3f97ad32..71485a41 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -16,7 +16,6 @@ pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/trunk CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/trunk fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/trunk pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/trunk -PlanetFlow-SVNPATH := http://svn.planet-lab.org/svn/PlanetFlow/trunk Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/trunk iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/trunk iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/trunk diff --git a/onelab.mk b/onelab.mk index 371a99c2..c86bfd40 100644 --- a/onelab.mk +++ b/onelab.mk @@ -180,14 +180,6 @@ pf2slice-SPEC := pf2slice.spec ALL += pf2slice -# -# netflow -# -netflow-MODULES := PlanetFlow -netflow-SPEC := netflow.spec -ALL += netflow -IN_BOOTSTRAPFS += netflow - # # PlanetLab Mom: Cleans up your mess # diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk index 2df3f277..46e0b093 100644 --- a/planetlab-tags-4.2.mk +++ b/planetlab-tags-4.2.mk @@ -17,7 +17,6 @@ CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-10 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-3 # not stable yet pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1 -PlanetFlow-SVNPATH := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-3 Mom-SVNBRANCH := 2.2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-4 iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-1 diff --git a/planetlab-tags.mk b/planetlab-tags.mk index 3d078d2d..8357f674 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -14,7 +14,6 @@ pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/trunk CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/trunk fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/trunk pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/trunk -PlanetFlow-SVNPATH := http://svn.planet-lab.org/svn/PlanetFlow/trunk Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/trunk iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/trunk iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/trunk diff --git a/planetlab.mk b/planetlab.mk index ebe40889..64f45cb1 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -157,15 +157,6 @@ pf2slice-MODULES := pf2slice pf2slice-SPEC := pf2slice.spec ALL += pf2slice - -# -# netflow -# -netflow-MODULES := PlanetFlow -netflow-SPEC := netflow.spec -ALL += netflow -IN_BOOTSTRAPFS += netflow - # # PlanetLab Mom: Cleans up your mess # -- 2.43.0