From 20fd195b5869f555b8044a50c480c102b913fb0d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 4 Feb 2011 14:56:27 +0100 Subject: [PATCH] catching up on 5.0-rc20 --- wextoolbox-tags.mk | 25 +++++++++++++------------ wextoolbox.mk | 34 +++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index ea293ec..c561e1a 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -10,7 +10,7 @@ spectools-GITPATH := git://git.onelab.eu/spectools@spectools-2009_06_R1-1 ### linux-2.6-BRANCH := rhel6 -linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-10 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-11 # spec2make does not know how to interpret that #kernel-RPMFLAGS += --without debug kernel-DEVEL-RPMS += elfutils-libelf-devel @@ -26,13 +26,13 @@ ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 ### util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-11 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-12 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 -util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21 -nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6 +util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-22 +nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-7 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@master +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-27 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 @@ -41,10 +41,10 @@ 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 #openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@master vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-1 -vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@master -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-27 +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-28 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-58 +plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-59 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-10 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35 @@ -54,21 +54,22 @@ pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9 pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1 #ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-9 +oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.5.1-1 ### #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@master +nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-16 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-8 bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-8 vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6 -bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-8 -myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-14 +bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-9 +myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-15 #DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 # locating the right test directory - see make tests_gitpath -tests-GITPATH := git://git.onelab.eu/tests.git@master +tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.0-23 ### temporary # nozomi not needed anymore for 2.6.27 diff --git a/wextoolbox.mk b/wextoolbox.mk index 38d33f8..b73ae15 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -514,20 +514,28 @@ IN_BOOTSTRAPFS += pyplnet IN_MYPLC += pyplnet IN_BOOTCD += pyplnet -### # -### # OMF resource controller -### # -### omf-resctl-MODULES := omf -### omf-resctl-SPEC := omf-resctl.spec -### ALL += omf-resctl -### IN_VSERVER += omf-resctl +# +# OMF resource controller +# +omf-resctl-MODULES := omf +omf-resctl-SPEC := omf-resctl.spec +ALL += omf-resctl +IN_VSERVER += omf-resctl -### # -### # OMF exp controller -### # -### omf-expctl-MODULES := omf -### omf-expctl-SPEC := omf-expctl.spec -### ALL += omf-expctl +# +# OMF exp controller +# +omf-expctl-MODULES := omf +omf-expctl-SPEC := omf-expctl.spec +ALL += omf-expctl + +# +# OML measurement library +# +oml-MODULES := oml +oml-DEVEL-RPMS += sqlite-devel +oml-SPEC := liboml.spec +ALL += oml # # bootcd -- 2.43.0