From: S.Çağlar Onur <caglar@cs.princeton.edu> Date: Sat, 18 Dec 2010 16:29:34 +0000 (-0500) Subject: use madwifi master and fix ocaml-docs dep. for vsys X-Git-Tag: 5.0-rc18~157 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=916a0f6044e342dbc21eeefe87b30559b2e62a88;p=build.git use madwifi master and fix ocaml-docs dep. for vsys --- diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs index bd584892..80a94837 100644 --- 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 1ef7cb61..a65819e5 100644 --- 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