X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fbootstrapfs.pkgs;h=4f05cccebd5612bba065162e32942a0637ba1f58;hb=46cb991a23c0e0d7b79f04833e68456a77c53280;hp=1ea5f6be7b1de7e686bfdeb97e1ecece49a41927;hpb=f9051cb50e3287839684763a7515d83cd895e592;p=build.git

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 1ea5f6be..4f05ccce 100644
--- 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* ulogd 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,12 +32,16 @@ package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: sysklogd
-package: SysVinit
+package+fc4: sysklogd
+package+fc6: sysklogd
+package+f7: sysklogd
+package+f8: rsyslog
 package: termcap
-package: util-linux
+package+fc4: util-linux
+package+fc6: util-linux
+package+f7: util-linux
+package+f8: util-linux-ng
 package: vim-minimal
-package: authconfig
 package: shadow-utils
 package: anacron
 package: at
@@ -54,7 +60,6 @@ package: logwatch
 package: mailcap
 package: nano
 package: nc
-package: netdump
 package: openssh-clients
 package: parted
 package: pciutils
@@ -82,11 +87,18 @@ package: perl
 package: python
 package: tar
 package: expect
-package: portmap
 package: nfs-utils
-package: schedutils
 package: openvpn
 package: vconfig
+package: PyXML
+# not found on other platforms
+package+fc4: netdump
+package+fc4: schedutils
+package+fc4: SysVinit
+package+fc6: SysVinit
+package+fc4: portmap
+package+fc6: portmap
+# planetlab
 package: madwifi
 package: wireless-tools
 package: util-vserver
@@ -100,13 +112,15 @@ package: util-vserver-pl
 package: NodeManager
 package: NodeUpdate
 package: codemux
-package: autofs
 package: pl_sshd
 package: ipod
 package: vserver-reference
 package: vserver-system-packages
 package: pl_mom
 package: netflow-utils
-package: PyXML
 package: proper
-package: vsys
+package+f8: fprobe-ulog
+# for vsys
+#package+f8: ocaml ocaml-docs
+#package+f8: inotify-tools-devel 
+package+f8: vsys