Second step towards multiarch myplc https://svn.planet-lab.org/ticket/214

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

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index ffc770b..4f05ccc 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* ulogd iptables
+#
 package: kernel
-package: kernel-smp
 package: udev
 package: basesystem
 package: filesystem
@@ -29,9 +32,15 @@ package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: sysklogd
+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: shadow-utils
 package: anacron
@@ -110,8 +119,8 @@ package: vserver-system-packages
 package: pl_mom
 package: netflow-utils
 package: proper
-package: fprobe-ulog
+package+f8: fprobe-ulog
 # for vsys
-package: ocaml ocaml-docs
-package: inotify-tools-devel 
-package: vsys
+#package+f8: ocaml ocaml-docs
+#package+f8: inotify-tools-devel 
+package+f8: vsys