From 821ad13bbb3c944012906f798167bd95c79b468d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 5 Jan 2011 12:30:52 +0100 Subject: [PATCH] use pending master heads - updated modules.list to point to vsys's master head now that all distros have gone away from 0.9 --- modules.list | 2 +- onelab-k27-tags.mk | 17 ++++++++--------- onelab-k32-tags.mk | 9 ++++----- onelab-tags.mk | 15 +++++++-------- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/modules.list b/modules.list index 656209b7..ab06d692 100644 --- a/modules.list +++ b/modules.list @@ -45,6 +45,6 @@ util-vserver util-vserver-pl util-vserver-pl:0.3 vserver-reference +vsys vsys-scripts -vsys:0.9 www-register-wizard diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index c658f870..7ada7f00 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -2,16 +2,16 @@ ### linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-33 -madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-1 +madwifi-GITPATH := git://git.onelab.eu/madwifi.git@master 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-19 +ipfw-GITPATH := git://git.onelab.eu/ipfw@master ### 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 +planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools@master ### util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-10 @@ -27,12 +27,11 @@ fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tag pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -vsys-BRANCH := 0.9 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-0 -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-24 +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@master +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master 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-57 +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 @@ -45,8 +44,8 @@ omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-8 ### sfa-GITPATH := git://git.onelab.eu/sfa.git@master sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-3 -nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-3 -bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-15 +nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@master +bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@master pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-7 bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-6 diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index b49366ac..a61715be 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -28,12 +28,11 @@ fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tag pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -vsys-BRANCH := 0.9 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-0 -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-24 +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@master +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master 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-57 +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 @@ -46,7 +45,7 @@ omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-8 ### sfa-GITPATH := git://git.onelab.eu/sfa.git@master sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-3 -nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-3 +nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@master bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@master pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-7 diff --git a/onelab-tags.mk b/onelab-tags.mk index 75ca747b..27b01a4a 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -8,10 +8,10 @@ iptables-BRANCH := 1.3.8 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-19 +ipfw-GITPATH := git://git.onelab.eu/ipfw@master 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 +planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools@master ### util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-10 @@ -28,12 +28,11 @@ fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tag pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -vsys-BRANCH := 0.9 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-0 -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-24 +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@master +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master 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-57 +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 @@ -46,8 +45,8 @@ omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-8 ### sfa-GITPATH := git://git.onelab.eu/sfa.git@master sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-3 -nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-3 -bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12 +nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@master +bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@master pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-7 bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-6 -- 2.43.0