catching up with onelab

diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
index bf54057..536da0c 100644 (file)
--- a/wextoolbox-tags.mk
+++ b/wextoolbox-tags.mk
@@ -10,37 +10,37 @@ spectools-GITPATH           := git://git.onelab.eu/spectools@spectools-2009_06_R1-1
 
 ###
 linux-2.6-BRANCH               := 32
-linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-33
+linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-36
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 
-madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-5
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-2
+madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-6
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
 ###
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-0.9-23
-###
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
 util-vserver-GITPATH            := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-20
-util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
+util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-28
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-35
+plnode-utils-GITPATH           := git://git.onelab.eu/plnode-utils@plnode-utils-0.2-1
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.1-13
 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-GITPATH             := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2
 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-4
+mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
 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@openvswitch-1.1.0pre2-2
 vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-2
-vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-39
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.1-1
+vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-44
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.1-3
 drupal-GITPATH                  := git://git.onelab.eu/drupal.git@drupal-4.7-15
-plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-72
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-74
 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-12
+pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-13
 pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
 ###
 pyaspects-GITPATH               := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-2
@@ -48,14 +48,14 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
 ###
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-7
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-22
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-24
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
-pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-14
+pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-15
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.1-2
-sliceimage-GITPATH              := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-1
-nodeimage-GITPATH               := git://git.onelab.eu/nodeimage.git@nodeimage-2.1-1
-myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.1-2
+sliceimage-GITPATH              := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-3
+nodeimage-GITPATH               := git://git.onelab.eu/nodeimage.git@nodeimage-2.1-2
+myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.1-4
 
 # 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.1-7
 

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 0d06ac4..9c3e128 100644 (file)
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -81,8 +81,6 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
-kernel-SPECVARS += iwlwifi=1 
 kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
 
@@ -92,7 +90,7 @@ kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 ALL += $(KERNELS)
 # this is to mark on which image a given rpm is supposed to go
 IN_BOOTCD += $(KERNELS)
-IN_SLICEIMAGE += $(KERNELS)
+#IN_SLICEIMAGE += $(KERNELS)
 IN_NODEIMAGE += $(KERNELS)
 
 #
@@ -109,9 +107,6 @@ IN_NODEIMAGE += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
-ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-        kernel_release=$(kernel.rpm-release) \
-        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
 #
@@ -189,12 +184,25 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+#
+# nodemanager
 #
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += nodemanager
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
+
+nodemanager-vs-MODULES := nodemanager
+nodemanager-vs-SPEC := nodemanager-vs.spec
+ALL += nodemanager-vs
+IN_NODEIMAGE += nodemanager-vs
 
 #
 # pl_sshd
@@ -230,7 +238,7 @@ ALL += pf2slice
 #
 # PlanetLab Mom: Cleans up your mess
 #
-mom-MODULES := Mom
+mom-MODULES := mom
 mom-SPEC := pl_mom.spec
 ALL += mom
 IN_NODEIMAGE += mom
@@ -240,18 +248,53 @@ IN_NODEIMAGE += mom
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+vsys-DEVEL-RPMS += ocaml-ocamldoc
 IN_NODEIMAGE += vsys
 ALL += vsys
 
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLICEIMAGE += vsyssh
+ALL += vsyssh
+
 #
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
+#
+# autoconf
+#
+# openvswitch requires an autoconf more recent than what f12 has
+ifeq "$(DISTRONAME)" "f12"
+autoconf-MODULES := autoconf
+autoconf-SPEC := autoconf.spec
+autoconf-BUILD-FROM-SRPM := yes
+ALL += autoconf
+endif
+
+#
+# sliver-openvswitch
+#
+sliver-openvswitch-MODULES := sliver-openvswitch
+sliver-openvswitch-SPEC := sliver-openvswitch.spec
+ifeq "$(DISTRONAME)" "f12"
+sliver-openvswitch-DEPEND-DEVEL-RPMS-UPDATES := autoconf
+endif
+IN_SLICEIMAGE += sliver-openvswitch
+ALL += sliver-openvswitch
+
 #
 # plcapi
 #