X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=blobdiff_plain;f=wextoolbox.mk;h=748a0d47b0f3063ee1d6595188e40673f2e86598;hp=ead3514199fa85f6f8e6198d397e6a513cb42ade;hb=ee8d63580076d63d109f02ffd0d927b005e17543;hpb=c758c9c55c16ded55519ec0ea03949e1a7583d09

diff --git a/wextoolbox.mk b/wextoolbox.mk
index ead3514..748a0d4 100644
--- 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
 #