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 1075f6a..d3b3e38 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -2,15 +2,17 @@
 # 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
 package: bash
 package: coreutils
 package: python
-package: coreutils
 package: cpio
 package: e2fsprogs
 package: ed
@@ -30,11 +32,8 @@ package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: sysklogd
 package: termcap
-package: util-linux
 package: vim-minimal
-package: authconfig
 package: shadow-utils
 package: anacron
 package: at
@@ -83,16 +82,33 @@ package: expect
 package: nfs-utils
 package: openvpn
 package: vconfig
-package: autofs
 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
@@ -108,18 +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
-##########
-# yum does not honor Requires(pre): tags
-# so e.g. even though vserver-reference needs coreutils in its %pre, 
-# and rightfully declares Requires(pre): coreutils
-# yum screws up and installs coreutils after vserver-reference
-# so the gory hack is, let's just retry the whole stuff again
-group: planetlab
-
+package+f8: fprobe-ulog
+package: vsys
+package-fc4: vsys
+package-fc6: vsys
+package: monitor