Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 8 Dec 2010 08:12:47 +0000 (09:12 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 8 Dec 2010 08:12:47 +0000 (09:12 +0100)
1  2 
onelab-k27-tags.mk
onelab-tags.mk

diff --combined onelab-k27-tags.mk
@@@ -2,13 -2,13 +2,13 @@@
  
  ###
  linux-2.6-GITPATH             := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-32
 -madwifi-SVNPATH                       := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 +madwifi-SVNPATH                       := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4132-1
  iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0
  iptables-BUILD-FROM-SRPM        := yes        # tmp
  iproute-BUILD-FROM-SRPM := yes        
  iproute2-GITPATH              := git://git.onelab.eu/iproute2.git@iproute2-2.6.33-2
  ###
- ipfw-GITPATH                  := git://git.onelab.eu/ipfw@ipfw-0.9-18
+ ipfw-GITPATH                  := git://git.onelab.eu/ipfw@ipfw-0.9-19
  ###
  comgt-SVNPATH                 := http://svn.onelab.eu/comgt/imports/0.3
  planetlab-umts-tools-GITPATH  := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5
diff --combined onelab-tags.mk
@@@ -8,7 -8,7 +8,7 @@@ iptables-BRANCH                  := 1.3.
  iptables-SVNPATH                := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
  iproute2-GITPATH              := git://git.onelab.eu/iproute2.git@iproute2-2.6.16-2
  ###
- ipfw-GITPATH                  := git://git.onelab.eu/ipfw@ipfw-0.9-18
+ ipfw-GITPATH                  := git://git.onelab.eu/ipfw@ipfw-0.9-19
  nozomi-GITPATH                        := git://git.onelab.eu/nozomi@nozomi-2.21-1
  comgt-SVNPATH                 := http://svn.onelab.eu/comgt/imports/0.3
  planetlab-umts-tools-GITPATH  := git://git.onelab.eu/planetlab-umts-tools@planetlab-umts-tools-0.6-5
@@@ -33,7 -33,7 +33,7 @@@ vsys-GITPATH                  := git://git.onelab.eu/v
  vsys-scripts-GITPATH          := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
  plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-23
  drupal-SVNPATH                        := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 -plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-56
 +plewww-GITPATH                  := git://git.onelab.eu/plewww.git@master
  www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
  pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-9
  Monitor-SVNPATH                       := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35