remove ooooold stuf

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 240f216..c3ef128 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -1,9 +1,5 @@
 lxc-userspace-GITPATH           := git://git.onelab.eu/lxc-userspace.git@lxc-userspace-2.0-0
 transforward-GITPATH            := git://git.onelab.eu/transforward.git@transforward-0.1-12
-procprotect-GITPATH             := git://git.onelab.eu/procprotect.git@procprotect-0.4-7
-# ipfw-sourceforge.git (obsolete) mirrored on git.onelab.eu from git://git.code.sf.net/p/dummynet/code
-# ipfw-google.git (current) is mirrored on git.onelab.eu from https://code.google.com/p/dummynet
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw-google.git@e717cdd4bef764a4aa7babedc54220b35b04c777
 comgt-GITPATH                  := git://git.onelab.eu/comgt.git@0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-1.0-0
@@ -13,13 +9,10 @@ nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanag
 #
 pl_sshd-GITPATH                        := git://git.onelab.eu/pl_sshd.git@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-3
 libvirt-GITPATH                 := git://git.onelab.eu/libvirt.git@libvirt-1.2.11-2
 libvirt-python-GITPATH          := git://git.onelab.eu/libvirt-python.git@libvirt-1.2.11-2
 pf2slice-GITPATH               := git://git.onelab.eu/pf2slice.git@pf2slice-1.0-2
-mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
 inotify-tools-GITPATH          := git://git.onelab.eu/inotify-tools.git@inotify-tools-3.13-2
-openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.2-1
 vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-4
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-51
 bind_public-GITPATH             := git://git.onelab.eu/bind_public.git@bind_public-0.1-3
@@ -30,24 +23,16 @@ plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-5.2-9
 www-register-wizard-GITPATH    := git://git.onelab.eu/www-register-wizard.git@www-register-wizard-4.3-5
 monitor-GITPATH                        := git://git.onelab.eu/monitor@monitor-3.1-6
 PLCRT-GITPATH                  := git://git.onelab.eu/plcrt.git@PLCRT-1.0-11
-pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.2-5
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-6.0-0
 pypcilib-GITPATH                := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-7.0-0
-DistributedRateLimiting-GITPATH        := git://git.onelab.eu/distributedratelimiting.git@DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-14
-###
-# omf-resctl now comes from yum and gem, no need for rvm-ruby anymore
-oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
-###
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-6.0-0
 sliceimage-GITPATH              := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-12
 nodeimage-GITPATH               := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-9
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-7.0-0
-
 #
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-4.0-2
 #
 tests-GITPATH                   := git://git.onelab.eu/tests.git@tests-7.0-0
-

diff --git a/lxc.mk b/lxc.mk
index 563590c..b538966 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -34,30 +34,13 @@ endif
 
 #
 # procprotect: root context module for protecting against weaknesses in /proc
+# has gone since f20
 #
-### remove procprotect from the nodes on f20 and above, needs more work starting with 3.19
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25 f27 f29)"
-procprotect-MODULES := procprotect
-procprotect-SPEC := procprotect.spec
-ALL += procprotect
-IN_NODEIMAGE += procprotect
-endif
 
 #
 # ipfw: root context module, and slice companion
+# has gone since f21
 #
-### starting August 2015, ipfw module won't build against fedora22
-# that comes with kernel 4.1.4
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23 f24 f25 f27 f29)"
-ipfwroot-MODULES := ipfw
-ipfwroot-SPEC := planetlab/ipfwroot.spec
-ALL += ipfwroot
-IN_NODEIMAGE += ipfwroot
-endif
-
-ipfwslice-MODULES := ipfw
-ipfwslice-SPEC := planetlab/ipfwslice.spec
-ALL += ipfwslice
 
 #
 # comgt - a companion to umts tools
@@ -133,79 +116,13 @@ IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
+# has gone since f20
 #
-# xxx temporarily turning this off on f20 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25 f27 f29)"
-fprobe-ulog-MODULES := fprobe-ulog
-fprobe-ulog-SPEC := fprobe-ulog.spec
-ALL += fprobe-ulog
-IN_NODEIMAGE += fprobe-ulog
-endif
-
-#################### libvirt version selection
-
-# use fedora's libvirt starting with f22
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)"
-local_libvirt=true
-endif
 
 #
-# libvirt
-#
-ifeq "$(local_libvirt)" "true"
-
-libvirt-MODULES := libvirt
-libvirt-SPEC    := libvirt.spec
-libvirt-BUILD-FROM-SRPM := yes
-# The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
-libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
-libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
-libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
-# for 1.2.1 - first seen on f20, not sure for the other ones
-libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
-# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
-libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
-# 1.2.11
-libvirt-STOCK-DEVEL-RPMS += wireshark-devel
-libvirt-STOCK-DEVEL-RPMS += ceph-devel-compat
-ALL += libvirt
-IN_NODEREPO += libvirt
-IN_NODEIMAGE += libvirt
-
-#
-## libvirt-python
-#
-libvirt-python-MODULES := libvirt-python
-libvirt-python-SPEC    := libvirt-python.spec
-libvirt-python-BUILD-FROM-SRPM := yes
-libvirt-python-STOCK-DEVEL-RPMS += pm-utils
-# for 1.2.11
-libvirt-python-STOCK-DEVEL-RPMS += python-nose
-# it would make sense to do something like this if we wanted to
-# build against python3 as well, but for now I turned this feature off
-# in libvirt-python
-#ifeq "$(distro)" "Fedora"
-#xxx if $(distrorelease) > 18
-#libvirt-python-STOCK-DEVEL-RPMS += python3-devel python3-nose python3-lxml
-#endif
-#endif
-libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
-libvirt-python-RPMFLAGS :=     --define 'packager PlanetLab'
-ALL += libvirt-python
-IN_NODEREPO += libvirt-python
-IN_NODEIMAGE += libvirt-python
-
-endif # local_libvirt
-
-#
-# DistributedRateLimiting
-#
-#DistributedRateLimiting-MODULES := DistributedRateLimiting
-#DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
-#ALL += DistributedRateLimiting
-#IN_NODEREPO += DistributedRateLimiting
+# our own brew of libvirt
+# is no longer needed since f22
+#
 
 #
 # pf2slice
@@ -214,26 +131,6 @@ pf2slice-MODULES := pf2slice
 pf2slice-SPEC := pf2slice.spec
 ALL += pf2slice
 
-##
-## PlanetLab Mom: Cleans up your mess
-##
-#mom-MODULES := mom
-#mom-SPEC := pl_mom.spec
-#ALL += mom
-#IN_NODEIMAGE += mom
-
-#
-# openvswitch
-#
-# openvswitch-MODULES := openvswitch
-# openvswitch-SPEC := openvswitch.spec
-# openvswitch-STOCK-DEVEL-RPMS += kernel-devel
-# IN_NODEIMAGE += openvswitch
-# # build only on f14 as f16 has this natively
-# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
-# ALL += openvswitch
-# endif
-
 #
 # vsys
 #
@@ -343,17 +240,6 @@ plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
 ALL += plcrt
 
-# f12 has 0.9-1 already
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-#
-# pyopenssl
-#
-pyopenssl-MODULES := pyopenssl
-pyopenssl-SPEC := pyOpenSSL.spec
-pyopenssl-BUILD-FROM-SRPM := yes
-ALL += pyopenssl
-endif
-
 # nodeconfig
 #
 nodeconfig-MODULES := nodeconfig
@@ -387,16 +273,6 @@ IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27 f29)"
-#
-# OML measurement library
-#
-oml-MODULES := oml
-oml-STOCK-DEVEL-RPMS += sqlite-devel
-oml-SPEC := liboml.spec
-ALL += oml
-endif
-
 #
 # bootcd
 #
@@ -504,7 +380,7 @@ ALL += release
 # sfa - Slice Facility Architecture
 #
 # this is python2, somehow the tests won't pass against a py3 plcapi
-# oddly enough, when the py2 sfa code issues xmlrpc calls over ssl 
+# oddly enough, when the py2 sfa code issues xmlrpc calls over ssl
 # to the underlying myplc, we get SSL handshake issues
 # so, let's keep this out of the way for now
 #

diff --git a/lxcpy2-tags.mk b/lxcpy2-tags.mk
index 532adca..7361ef7 100644 (file)
--- a/lxcpy2-tags.mk
+++ b/lxcpy2-tags.mk
@@ -1,9 +1,5 @@
 lxc-userspace-GITPATH           := git://git.onelab.eu/lxc-userspace.git@lxc-userspace-1.0-12
 transforward-GITPATH            := git://git.onelab.eu/transforward.git@transforward-0.1-12
-procprotect-GITPATH             := git://git.onelab.eu/procprotect.git@procprotect-0.4-7
-# ipfw-sourceforge.git (obsolete) mirrored on git.onelab.eu from git://git.code.sf.net/p/dummynet/code
-# ipfw-google.git (current) is mirrored on git.onelab.eu from https://code.google.com/p/dummynet
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw-google.git@e717cdd4bef764a4aa7babedc54220b35b04c777
 comgt-GITPATH                  := git://git.onelab.eu/comgt.git@0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-14
@@ -13,13 +9,10 @@ nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@nodemanag
 #
 pl_sshd-GITPATH                        := git://git.onelab.eu/pl_sshd.git@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-3
 libvirt-GITPATH                 := git://git.onelab.eu/libvirt.git@libvirt-1.2.11-2
 libvirt-python-GITPATH          := git://git.onelab.eu/libvirt-python.git@libvirt-1.2.11-2
 pf2slice-GITPATH               := git://git.onelab.eu/pf2slice.git@pf2slice-1.0-2
-mom-GITPATH                     := git://git.onelab.eu/mom.git@mom-2.3-5
 inotify-tools-GITPATH          := git://git.onelab.eu/inotify-tools.git@inotify-tools-3.13-2
-openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.2-1
 vsys-GITPATH                    := git://git.onelab.eu/vsys.git@vsys-0.99-4
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-51
 bind_public-GITPATH             := git://git.onelab.eu/bind_public.git@bind_public-0.1-3
@@ -30,22 +23,15 @@ plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-5.2-9
 www-register-wizard-GITPATH    := git://git.onelab.eu/www-register-wizard.git@www-register-wizard-4.3-5
 monitor-GITPATH                        := git://git.onelab.eu/monitor@monitor-3.1-6
 PLCRT-GITPATH                  := git://git.onelab.eu/plcrt.git@PLCRT-1.0-11
-pyopenssl-GITPATH               := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.2-5
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-6.0-0
 pypcilib-GITPATH                := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11
 pyplnet-GITPATH                 := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-20
-DistributedRateLimiting-GITPATH        := git://git.onelab.eu/distributedratelimiting.git@DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-14
-###
-# omf-resctl now comes from yum and gem, no need for rvm-ruby anymore
-oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.6.1-1
-###
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-6.0-0
 sliceimage-GITPATH              := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-12
 nodeimage-GITPATH               := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-9
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@myplc-5.3-5
-
 #
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-4.0-2
 #