From 305c3e9de9e68499fb99a7b48e35814ef9d94440 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 6 May 2008 04:40:43 +0000 Subject: [PATCH] cleaning up ulogd, proper, and libhttpd++ --- config.planetlab/bootcd.pkgs | 2 +- config.planetlab/bootstrapfs.pkgs | 6 +----- config.planetlab/vserver.pkgs | 2 +- modules.list | 3 --- onelab-tags-4.2.mk | 3 --- onelab-tags.mk | 3 --- onelab.mk | 29 ----------------------------- planetlab-tags-4.2.mk | 3 --- planetlab-tags.mk | 3 --- planetlab.mk | 29 ----------------------------- 10 files changed, 3 insertions(+), 80 deletions(-) diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs index 94d3daf0..63cab0a0 100644 --- 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 052b00e8..d3b3e38c 100644 --- 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 8651e381..8e922c69 100644 --- 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 9b0c84a8..a73c9323 100644 --- 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 4ccd1f3a..cd76b42c 100644 --- 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 263eb284..3f97ad32 100644 --- 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 5deb426b..371a99c2 100644 --- 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 e488321d..2df3f277 100644 --- 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 f168bdf4..3d078d2d 100644 --- 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 5f45c8e1..ebe40889 100644 --- 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 # -- 2.43.0