cleaning up ulogd, proper, and libhttpd++

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index 94d3daf..63cab0a 100644 (file)
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -2,7 +2,7 @@ groupname: PlanetLabBootcd
 groupdesc: PlanetLab BootCD
 # This is the replacement for the former mkfedora -k. The following packages
 # will get excluded from the stock fedora repos, as we need to use ours
-kexclude: kernel* ulogd iptables
+kexclude: kernel* iptables
 # from prep.sh, was hardwired as packagelist
 package: filesystem
 package: udev

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 052b00e..d3b3e38 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -4,7 +4,7 @@ groupname: PlanetLab
 groupdesc: PlanetLab Node Root
 # This is the replacement for the former mkfedora -k. The following packages
 # will get excluded from the stock fedora repos, as we need to use ours
-kexclude: kernel* ulogd iptables
+kexclude: kernel* iptables
 #
 package: kernel
 package: udev
@@ -128,11 +128,7 @@ package: vserver-@pldistro@-@fcdistro@-@arch@
 package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
 package: pl_mom
 package: netflow-utils
-#package: proper
 package+f8: fprobe-ulog
-# for vsys
-#package+f8: ocaml ocaml-docs
-#package+f8: inotify-tools-devel 
 package: vsys
 package-fc4: vsys
 package-fc6: vsys

diff --git a/config.planetlab/vserver.pkgs b/config.planetlab/vserver.pkgs
index 8651e38..8e922c6 100644 (file)
--- a/config.planetlab/vserver.pkgs
+++ b/config.planetlab/vserver.pkgs
@@ -2,7 +2,7 @@ groupname: PlanetLabSlice
 groupdesc: PlanetLab Slice Reference Image
 # This is the replacement for the former mkfedora -k. The following packages
 # will get excluded from the stock fedora repos, as we need to use ours
-kexclude: kernel* ulogd iptables
+kexclude: kernel* iptables
 # define packages
 package: bash
 package: coreutils

diff --git a/modules.list b/modules.list
index 9b0c84a..a73c932 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -17,16 +17,13 @@ VserverReference
 fprobe-ulog
 iproute2
 iptables
-libhttpd++
 libnl
 linux-2.6
 madwifi
 nodeconfig
 pf2slice
 pl_sshd
-proper
 pypcilib
-ulogd
 util-vserver-pl
 util-vserver:scholz
 vsys

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 4ccd1f3..cd76b42 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -19,10 +19,7 @@ PingOfDeath-SVNPATH          := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDea
 NodeManager-SVNBRANCH          := 1.7
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-7
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-10
-libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/tags/libhttpd++-0.1.4-1
-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-10
-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-3
 # not stable yet
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 263eb28..3f97ad3 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -13,10 +13,7 @@ NodeUpdate-SVNPATH           := http://svn.planet-lab.org/svn/NodeUpdate/trunk
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/trunk
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/trunk
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/trunk
-libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/trunk
-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

diff --git a/onelab.mk b/onelab.mk
index 5deb426..371a99c 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -155,26 +155,6 @@ pl_sshd-SPEC := pl_sshd.spec
 ALL += pl_sshd
 IN_BOOTSTRAPFS += pl_sshd
 
-#
-# libhttpd++: 
-#
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
-#
-libhttpd-MODULES := libhttpd++
-libhttpd-SPEC := libhttpd++.spec
-ALL += libhttpd
-IN_BOOTSTRAPFS += libhttpd
-
-#
-# proper: Privileged Operations Service
-#
-proper-MODULES := proper
-proper-SPEC := proper.spec
-proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
-ALL += proper
-IN_BOOTSTRAPFS += proper
-
 #
 # codemux: Port 80 demux
 #
@@ -184,15 +164,6 @@ codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
-#
-# ulogd
-#
-ulogd-MODULES := ulogd
-ulogd-SPEC := ulogd.spec
-ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
-ALL += ulogd
-IN_VSERVER += ulogd
-
 #
 # fprobe-ulog
 #

diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk
index e488321..2df3f27 100644 (file)
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -13,10 +13,7 @@ PingOfDeath-SVNPATH          := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDea
 NodeManager-SVNBRANCH          := 1.7
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-7
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-10
-libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/tags/libhttpd++-0.1.4-1
-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-10
-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-3
 # not stable yet
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index f168bdf..3d078d2 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -11,10 +11,7 @@ NodeUpdate-SVNPATH           := http://svn.planet-lab.org/svn/NodeUpdate/trunk
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/trunk
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/trunk
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/trunk
-libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/trunk
-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

diff --git a/planetlab.mk b/planetlab.mk
index 5f45c8e..ebe4088 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -133,26 +133,6 @@ pl_sshd-SPEC := pl_sshd.spec
 ALL += pl_sshd
 IN_BOOTSTRAPFS += pl_sshd
 
-#
-# libhttpd++: 
-#
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
-#
-libhttpd-MODULES := libhttpd++
-libhttpd-SPEC := libhttpd++.spec
-ALL += libhttpd
-IN_BOOTSTRAPFS += libhttpd
-
-#
-# proper: Privileged Operations Service
-#
-proper-MODULES := proper
-proper-SPEC := proper.spec
-proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
-ALL += proper
-IN_BOOTSTRAPFS += proper
-
 #
 # codemux: Port 80 demux
 #
@@ -162,15 +142,6 @@ codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
-#
-# ulogd
-#
-ulogd-MODULES := ulogd
-ulogd-SPEC := ulogd.spec
-ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
-ALL += ulogd
-IN_VSERVER += ulogd
-
 #
 # fprobe-ulog
 #