cleaning up ulogd, proper, and libhttpd++

[build.git] / config.planetlab / bootstrapfs.pkgs

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index b819bae..d3b3e38 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -2,8 +2,11 @@
 # groupname: Bootstrapfs
 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* iptables
+#
 package: kernel
-package: kernel-smp
 package: udev
 package: basesystem
 package: filesystem
@@ -29,9 +32,7 @@ package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: sysklogd
 package: termcap
-package: util-linux
 package: vim-minimal
 package: shadow-utils
 package: anacron
@@ -82,14 +83,32 @@ package: nfs-utils
 package: openvpn
 package: vconfig
 package: PyXML
+#
+# platform-dependent
+#
+package+fc4: sysklogd
+package+fc6: sysklogd
+package+f7: sysklogd
+package+f8: rsyslog
+package+centos5: sysklogd
+
+package+fc4: util-linux
+package+fc6: util-linux
+package+f7: util-linux
+package+f8: util-linux-ng
+package+centos5: util-linux
+
 # not found on other platforms
 package+fc4: netdump
 package+fc4: schedutils
 package+fc4: SysVinit
-package+fc6: SysVinit
 package+fc4: portmap
+# 
+package+fc6: SysVinit
 package+fc6: portmap
+#
 # planetlab
+#
 package: madwifi
 package: wireless-tools
 package: util-vserver
@@ -105,25 +124,12 @@ package: NodeUpdate
 package: codemux
 package: pl_sshd
 package: ipod
-package: vserver-reference
-package: vserver-system-packages
+package: vserver-@pldistro@-@fcdistro@-@arch@
+package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
 package: pl_mom
 package: netflow-utils
-package: proper
-# not ready yet
-#package: vsys
-
-# Install the "PlanetLab" group. This requires that the 
-# build system install the appropriate yumgroups.xml file 
-# -- currently build/groups/<pldistro>.xml --
-# <build>/RPMS/ and that the build runs createrepo on that directory. 
-# dev is specified explicitly because of a stupid bug in its %post script
-# that causes its installation to fail; see pl_root_mkfedora for a
-# full explanation. coreutils and python are specified explicitly
-# because groupinstall does not honor Requires(pre) dependencies
-# properly, most %pre scripts require coreutils to be installed first,
-# and some of our %post scripts require python.
-package: dev
-package: python
-package: coreutils
-group: PlanetLab
+package+f8: fprobe-ulog
+package: vsys
+package-fc4: vsys
+package-fc6: vsys
+package: monitor