build pf2slice in all configs

diff --git a/modules.list b/modules.list
index 70ead93..9e6c8fe 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -19,6 +19,7 @@ libhttpd++
 libnl
 linux-2.6
 madwifi
+pf2slice
 pl_sshd
 plcmdline
 proper

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 8101644..d4f7771 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -19,6 +19,7 @@ proper-SVNPATH                        := http://svn.planet-lab.org/svn/proper/tags/proper-0.3-37
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-7
 ulogd-SVNPATH                  := http://svn.planet-lab.org/svn/ulogd/tags/ulogd-1.24-4
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-1
+pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/trunk
 PlanetFlow-SVNPATH             := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-2
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-0

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 61ab2f1..9d023b3 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -19,6 +19,7 @@ proper-SVNPATH                        := http://svn.planet-lab.org/svn/proper/trunk
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/trunk
 ulogd-SVNPATH                  := http://svn.planet-lab.org/svn/ulogd/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

diff --git a/onelab.mk b/onelab.mk
index c8dd831..7bdebd7 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -202,6 +202,14 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+#
+# pf2slice
+#
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
+
+
 #
 # netflow
 #

diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk
index 8ab5876..9fc13fd 100644 (file)
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -17,6 +17,7 @@ proper-SVNPATH                        := http://svn.planet-lab.org/svn/proper/tags/proper-0.3-37
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-7
 ulogd-SVNPATH                  := http://svn.planet-lab.org/svn/ulogd/tags/ulogd-1.24-4
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-1
+pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/trunk
 PlanetFlow-SVNPATH             := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-2
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-0