From 4bfad922a62b5782224598da4a17bd9419b744b1 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 23 Jul 2009 21:29:16 +0000 Subject: [PATCH] switch to sfa module --- coblitz-tags.mk | 2 +- coblitz.mk | 2 +- module-log.py | 4 ++-- modules.list | 2 +- onelab-tags.mk | 2 +- onelab.mk | 2 +- planetbridge-tags.mk | 2 +- planetbridge.mk | 2 +- planetlab-k27-tags.mk | 2 +- planetlab-tags.mk | 2 +- planetlab.mk | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/coblitz-tags.mk b/coblitz-tags.mk index 945d80ef..6e42f550 100644 --- a/coblitz-tags.mk +++ b/coblitz-tags.mk @@ -39,7 +39,7 @@ BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21 -sfa-SVNPATH := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5 diff --git a/coblitz.mk b/coblitz.mk index 363b34c8..302f2a7c 100644 --- a/coblitz.mk +++ b/coblitz.mk @@ -277,7 +277,7 @@ ALL += pyopenssl # -# sfa - Slice Facility Architecture - fka geniwrapper +# sfa - Slice Facility Architecture # sfa-MODULES := sfa sfa-SPEC := sfa.spec diff --git a/module-log.py b/module-log.py index 5ab53747..2241460c 100755 --- a/module-log.py +++ b/module-log.py @@ -17,10 +17,10 @@ modules_map = { 'NodeUpdate', 'CoDemux', 'nodeconfig', 'pl_sshd', 'libnl', 'pypcilib', 'pyplnet',], - 'wifi' : ['madwifi', 'PlanetBridge', 'wifiadmin', 'hostapd',], + 'wifi' : ['madwifi', 'PlanetBridge', 'hostapd',], 'emulation': ['dummynet_image', 'ipfw', ], 'netflow' : [ 'fprobe-ulog', 'pf2gui', 'pf2monitor', 'pf2slice', 'iproute2', 'iptables', 'silk',], - 'sfa' : [ 'geniwrapper', 'xmlrspecs', 'pyopenssl', ], + 'sfa' : [ 'sfa', 'xmlrspecs', 'pyopenssl', ], 'vsys' : ['vsys', 'vsys-scripts', 'vsys-wrappers', 'inotify-tools'], 'deprecated' : [ 'proper', 'libhttpd++', 'oombailout', 'ulogd', 'patchdep', 'pdelta', 'sandbox', 'playground', 'infrastructure', 'util-python', 'vnetspec', diff --git a/modules.list b/modules.list index 39b52127..448cacbe 100644 --- a/modules.list +++ b/modules.list @@ -16,7 +16,6 @@ comgt drupal dummynet_image fprobe-ulog -geniwrapper inotify-tools iproute2 iptables @@ -34,6 +33,7 @@ planetlab-umts-tools pyopenssl pypcilib pyplnet +sfa util-vserver-pl util-vserver:scholz vsys-scripts diff --git a/onelab-tags.mk b/onelab-tags.mk index eb407a3c..8c1cda7c 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -45,7 +45,7 @@ BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk -sfa-SVNPATH := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5 diff --git a/onelab.mk b/onelab.mk index 35222ad1..9b6deec4 100644 --- a/onelab.mk +++ b/onelab.mk @@ -340,7 +340,7 @@ ALL += pyopenssl # -# sfa - Slice Facility Architecture - fka geniwrapper +# sfa - Slice Facility Architecture # sfa-MODULES := sfa sfa-SPEC := sfa.spec diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk index 83afa6a5..906da72c 100644 --- a/planetbridge-tags.mk +++ b/planetbridge-tags.mk @@ -39,7 +39,7 @@ BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21 -sfa-SVNPATH := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5 diff --git a/planetbridge.mk b/planetbridge.mk index 3b033277..51ceffac 100644 --- a/planetbridge.mk +++ b/planetbridge.mk @@ -277,7 +277,7 @@ ALL += pyopenssl # -# sfa - Slice Facility Architecture - fka geniwrapper +# sfa - Slice Facility Architecture # sfa-MODULES := sfa sfa-SPEC := sfa.spec diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index e8481676..2da9ea41 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -37,7 +37,7 @@ BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21 -sfa-SVNPATH := http://svn.planet-lab.org/svn/geniwrapper/trunk +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/trunk pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5 diff --git a/planetlab-tags.mk b/planetlab-tags.mk index 83afa6a5..906da72c 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -39,7 +39,7 @@ BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-14 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-12 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-21 -sfa-SVNPATH := http://svn.planet-lab.org/svn/geniwrapper/tags/geniwrapper-0.8-6 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-0 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-5 diff --git a/planetlab.mk b/planetlab.mk index 3b033277..51ceffac 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -277,7 +277,7 @@ ALL += pyopenssl # -# sfa - Slice Facility Architecture - fka geniwrapper +# sfa - Slice Facility Architecture # sfa-MODULES := sfa sfa-SPEC := sfa.spec -- 2.43.0