use madwifi master and fix ocaml-docs dep. for vsys

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

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 1ef7cb6..a65819e 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-4
-madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4099-0
+madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@master
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes