tweak for build dependencies

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 33e6032..9e4edb6 100644 (file)
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -86,7 +86,7 @@ package: pciutils-devel
 package: python-simplejson
 ##########
 # for vsys - same as for php-devel above
-package: ocaml.@arch@ ocaml-ocamldoc
+package: ocaml.@arch@
 # use local inotify-tools on centos
 package>=f8:inotify-tools-devel 
 ##########

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 15ed21b..78de7e7 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -5,6 +5,7 @@ linux-2.6-BRANCH                := rhel6
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@rhel6
 # spec2make does not know how to interpret that
 #kernel-RPMFLAGS                       += --without debug
+kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
 iptables-BUILD-FROM-SRPM        := yes # tmp
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-1

diff --git a/onelab.mk b/onelab.mk
index 1854b69..141ab28 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -271,6 +271,8 @@ ALL += openvswitch
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
+vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
 vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 0756f83..5b36fc1 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -3,6 +3,7 @@
 mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-0
 linux-2.6-BRANCH               := rhel6
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-9
+kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-1
 iptables-BUILD-FROM-SRPM := yes        # tmp

diff --git a/planetlab.mk b/planetlab.mk
index f14c47a..a448949 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -231,6 +231,8 @@ ALL += openvswitch
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
+vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
 vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif