synced from onelab

diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
index c561e1a..78a7426 100644 (file)
--- a/wextoolbox-tags.mk
+++ b/wextoolbox-tags.mk
@@ -9,69 +9,49 @@ spectools-GITPATH             := git://git.onelab.eu/spectools@spectools-2009_06_R1-1
 #sge-GITPATH                   := git://git.onelab.eu/sge/trunk
 
 ###
-linux-2.6-BRANCH               := rhel6
-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
+linux-2.6-BRANCH               := 32
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
-madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
-iptables-BUILD-FROM-SRPM        := yes # tmp
-iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-2
-iproute-BUILD-FROM-SRPM                := yes  
-iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
+madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-5
+iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
 ###
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-0.9-20
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-0.9-23
 ###
-#comgt-SVNPATH                 := http://svn.onelab.eu/comgt/imports/0.3
 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-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-22
-nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-7
+util-vserver-GITPATH            := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-19
+util-vserver-pl-GITPATH         := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
+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-27
+nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-34
 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
+fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3
 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
+Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
 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.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-59
+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-34
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-36
+drupal-GITPATH                  := git://git.onelab.eu/drupal.git@drupal-4.7-15
+plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.69
 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
-PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
-pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
+pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-12
+pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
 ###
-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
+pyaspects-GITPATH               := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-2
+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
 ###
-#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-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
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
+pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
+pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11
+bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-11
 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-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
+bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-13
+myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.0-19
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-23
+tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-5.0-36
 
-### temporary
-# nozomi not needed anymore for 2.6.27
-ALL:=$(subst nozomi,,$(ALL))
-IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS))

diff --git a/wextoolbox.mk b/wextoolbox.mk
index ead3514..748a0d4 100644 (file)
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -20,32 +20,6 @@
 # see doc in Makefile  
 #
 
-########## this should not be needed with f14 anymore 
-#f14# #
-#f14# # boost
-#f14# # 
-#f14# # we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
-#f14# # this build is based on the f11 rpm, i.e. boost-1.37
-#f14# #
-#f14# boost-MODULES := boost
-#f14# boost-SPEC := boost.spec
-#f14# boost-BUILD-FROM-SRPM := yes
-#f14# boost-DEVEL-RPMS := bzip2-devel libicu-devel chrpath
-#f14# ALL += boost
-#f14# IN_BOOTSTRAPFS += boost
-#f14# 
-#f14# #
-#f14# # gnuradio
-#f14# #
-#f14# gnuradio-MODULES := gnuradio
-#f14# gnuradio-SPEC := gnuradio.spec
-#f14# gnuradio-BUILD-FROM-SRPM := yes
-#f14# gnuradio-DEVEL-RPMS := python-numeric numpy wxPython PyQt4 swig fftw sdcc gsl guile cppunit fftw-devel gsl-devel libusb-devel cppunit-devel
-#f14# # boost-devel needs boost !
-#f14# gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
-#f14# ALL += gnuradio
-#f14# IN_BOOTSTRAPFS += gnuradio
-
 #
 # bbn
 #
@@ -153,26 +127,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-### # 
-### # nozomi
-### # 
-### nozomi-MODULES := nozomi
-### nozomi-SPEC := nozomi.spec
-### nozomi-DEPEND-DEVEL-RPMS += kernel-devel
-### nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-###    kernel_release=$(kernel.rpm-release) \
-###    kernel_arch=$(kernel.rpm-arch)
-### IN_BOOTSTRAPFS += nozomi
-### ALL += nozomi
-
-### #
-### # comgt
-### # 
-### comgt-MODULES := comgt
-### comgt-SPEC := comgt.spec
-### IN_BOOTSTRAPFS += comgt
-### ALL += comgt
-
 #
 # umts: root context stuff
 #
@@ -198,16 +152,6 @@ iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-
 #
 # util-vserver
 #
@@ -217,26 +161,6 @@ util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
 
-#
-# libnl - local import
-# we need either 1.1 or at least 1.0.pre6
-# rebuild this on centos5 - see yumexclude
-#
-local_libnl=false
-ifeq "$(DISTRONAME)" "centos5"
-local_libnl=true
-endif
-
-ifeq "$(local_libnl)" "true"
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-libnl-BUILD-FROM-SRPM := yes
-# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
-ALL += libnl
-IN_BOOTSTRAPFS += libnl
-endif
-
 #
 # util-vserver-pl
 #
@@ -297,15 +221,6 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
-### #
-### # DistributedRateLimiting
-### #
-### DistributedRateLimiting-MODULES := DistributedRateLimiting
-### DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
-### ALL += DistributedRateLimiting
-### IN_NODEREPO += DistributedRateLimiting
-
-
 #
 # pf2slice
 #
@@ -338,15 +253,6 @@ IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools
 endif
 
-### #
-### # openvswitch
-### #
-### openvswitch-MODULES := openvswitch
-### openvswitch-SPEC := openvswitch.spec
-### openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-### IN_BOOTSTRAPFS += openvswitch
-### ALL += openvswitch
-
 #
 # vsys
 #
@@ -407,31 +313,6 @@ pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
 
-#
-# monitor
-#
-monitor-MODULES := Monitor
-monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
-
-### #
-### # zabbix
-### #
-### zabbix-MODULES := Monitor
-### zabbix-SPEC := zabbix.spec
-### zabbix-BUILD-FROM-SRPM := yes
-### zabbix-DEVEL-RPMS += python-cherrypy
-### ALL += zabbix
-### 
-### #
-### # PLC RT
-### #
-### plcrt-MODULES := PLCRT
-### plcrt-SPEC := plcrt.spec
-### ALL += plcrt
-
 #
 # pyopenssl
 #
@@ -448,38 +329,6 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-### #
-### # ejabberd
-### #
-### ejabberd-MODULES := ejabberd
-### ejabberd-SPEC := ejabberd.spec
-### ejabberd-BUILD-FROM-SRPM := yes
-### ejabberd-DEVEL-RPMS += erlang pam-devel hevea
-### # not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
-### # so, this is relevant on f8 and centos5 only
-### ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-### ALL += ejabberd
-### endif
-
-### # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-### build_sfa=true
-### ifeq "$(DISTRONAME)" "centos5"
-### build_sfa=false
-### endif
-
-### ifeq "$(build_sfa)" "true"
-### #
-### # sfa - Slice Facility Architecture
-### #
-### sfa-MODULES := sfa
-### sfa-SPEC := sfa.spec
-### ALL += sfa
-### endif
-
-### sface-MODULES := sface
-### sface-SPEC := sface.spec
-### ALL += sface
-
 #
 # nodeconfig
 #