vsys does not build on centos as caml and inotify-devel are not available

cleanup in distro-dependant packages, general rule is to treat the early distros as exceptions
rather than the other way around (f9 is coming)

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 73fc550..cf8e4cc 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -32,15 +32,7 @@ package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package+fc4: sysklogd
-package+fc6: sysklogd
-package+f7: sysklogd
-package+f8: rsyslog
 package: termcap
-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
@@ -91,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
@@ -123,4 +133,6 @@ package+f8: fprobe-ulog
 # for vsys
 #package+f8: ocaml ocaml-docs
 #package+f8: inotify-tools-devel 
-package+f8: vsys
+package: vsys
+package-fc4: vsys
+package-fc6: vsys

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 9d2b7ce..f2d3526 100644 (file)
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -80,5 +80,7 @@ package: PyXML
 # for pypcilib
 package: pciutils-devel
 # for vsys
-package: ocaml ocaml-docs
-package: inotify-tools-devel 
+package: ocaml ocaml-docs inotify-tools-devel 
+package-fc4: ocaml ocaml-docs inotify-tools-devel 
+package-fc6: ocaml ocaml-docs inotify-tools-devel 
+package-centos5: ocaml ocaml-docs inotify-tools-devel 

diff --git a/onelab.mk b/onelab.mk
index 72bc3ed..159d60f 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -244,17 +244,21 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
-vsys-MODULES := vsys
-vsys-SPEC := vsys.spec
-ifeq "$(DISTRONAME)" "f7"
-IN_BOOTSTRAPFS += vsys
-ALL += vsys
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
 endif
-ifeq "$(DISTRONAME)" "f8"
-IN_BOOTSTRAPFS += vsys
-ALL += vsys
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
 endif
+# cannot find the required packages (see devel.pkgs) on centos5
 ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
+vsys-MODULES := vsys
+vsys-SPEC := vsys.spec
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif

diff --git a/planetlab.mk b/planetlab.mk
index 355072c..a2f679a 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -223,17 +223,21 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
-vsys-MODULES := vsys
-vsys-SPEC := vsys.spec
-ifeq "$(DISTRONAME)" "f7"
-IN_BOOTSTRAPFS += vsys
-ALL += vsys
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
 endif
-ifeq "$(DISTRONAME)" "f8"
-IN_BOOTSTRAPFS += vsys
-ALL += vsys
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
 endif
+# cannot find the required packages (see devel.pkgs) on centos5
 ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
+vsys-MODULES := vsys
+vsys-SPEC := vsys.spec
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif