Merge remote branch 'PL/master'

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index 995b481..603703a 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -1,47 +1,38 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
-mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-3
+mkinitrd-GITPATH               := git://git.verivue.com/planetlab/mkinitrd.git@mkinitrd-5.1.19.6-3
 linux-2.6-BRANCH                := rhel6
-linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-16
-madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
-util-vserver-GITPATH            := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-15
+linux-2.6-GITPATH               := git://git.verivue.com/planetlab/linux-2.6.git@linux-2.6-32-16
+madwifi-GITPATH                 := git://git.verivue.com/planetlab/madwifi.git@madwifi-4132-2
+util-vserver-GITPATH            := git://git.verivue.com/planetlab/util-vserver.git@util-vserver-0.30.216-15
 util-vserver-BUILD-FROM-SRPM   := yes     # tmp
-util-vserver-pl-GITPATH         := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-25
-libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-8
-PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH            := git://git.planet-lab.org/nodemanager@nodemanager-1.8-38
-pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet@pyplnet-4.3-9
-pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-codemux-GITPATH                 := git://git.planet-lab.org/codemux.git@CoDemux-0.1-13
-fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-1
-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
+util-vserver-pl-GITPATH         := git://git.verivue.com/planetlab/util-vserver-pl.git@util-vserver-pl-0.4-25
+libnl-GITPATH                  := git://git.verivue.com/planetlab/libnl.git@libnl-1.1-2
+nodeupdate-GITPATH             := git://git.verivue.com/planetlab/nodeupdate.git@nodeupdate-0.5-8
+nodemanager-GITPATH            := git://git.verivue.com/planetlab/nodemanager@nodemanager-1.8-38
+pyplnet-GITPATH                 := git://git.verivue.com/planetlab/pyplnet@pyplnet-4.3-11
+codemux-GITPATH                 := git://git.verivue.com/planetlab/codemux.git@CoDemux-0.1-13
 iptables-BUILD-FROM-SRPM        := yes # tmp
-iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
+iptables-GITPATH                := git://git.verivue.com/planetlab/iptables.git@iptables-1.4.10-4
 iproute-BUILD-FROM-SRPM         := yes # tmp
-iproute2-GITPATH                := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
-inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH                    := 0.9
-vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
-vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18
-plcapi-GITPATH                 := git://git.planet-lab.org/plcapi@plcapi-4.3-37
-drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH                  := git://git.planet-lab.org/plewww@PLEWWW-4.3-53
-www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
-pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2/
-nodeconfig-GITPATH              := git://git.planet-lab.org/nodeconfig.git@nodeconfig-4.3-9
+iproute2-GITPATH                := git://git.verivue.com/planetlab/iproute2.git@iproute2-2.6.35-0
+inotify-tools-GITPATH          := git://git.verivue.com/planetlab/inotify-tools.git@inotify-tools-3.13-2
+vsys-GITPATH                    := git://git.verivue.com/planetlab/vsys.git@vsys-0.99-1
+vsys-scripts-GITPATH            := git://git.verivue.com/planetlab/vsys-scripts.git@vsys-scripts-0.95-28
+plcapi-GITPATH                 := git://git.verivue.com/planetlab/plcapi@plcapi-4.3-38
+drupal-GITPATH                 := git://git.verivue.com/planetlab/drupal.git@drupal-4.7-14
+plewww-GITPATH                  := git://git.verivue.com/planetlab/plewww@PLEWWW-4.3-53
+pcucontrol-GITPATH              := git://git.verivue.com/planetlab/pcucontrol.git@pcucontrol-1.0-2
+nodeconfig-GITPATH              := git://git.verivue.com/planetlab/nodeconfig.git@nodeconfig-4.3-10
 bootmanager-BRANCH             := 4.3
-bootmanager-GITPATH            := git://git.planet-lab.org/bootmanager@bootmanager-4.3-24
-pypcilib-GITPATH                := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
-bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-4.2-25
-vserver-reference-GITPATH      := git://git.planet-lab.org/vserver-reference@vserver-reference-4.2-18
-bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-1.0-12
-myplc-GITPATH                   := git://git.planet-lab.org/myplc@myplc-4.3-47
-sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
-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-11
+bootmanager-GITPATH            := git://git.verivue.com/planetlab/bootmanager@bootmanager-4.3-25
+pypcilib-GITPATH                := git://git.verivue.com/planetlab/pypcilib.git@pypcilib-0.2-10
+bootcd-GITPATH                  := git://git.verivue.com/planetlab/bootcd.git@bootcd-4.2-25
+vserver-reference-GITPATH      := git://git.verivue.com/planetlab/vserver-reference@vserver-reference-4.2-18
+bootstrapfs-GITPATH             := git://git.verivue.com/planetlab/bootstrapfs.git@BootstrapFS-1.0-12
+myplc-GITPATH                   := git://git.verivue.com/planetlab/myplc@myplc-4.3-50
+pyopenssl-GITPATH              := git://git.verivue.com/planetlab/pyopenssl.git@pyopenssl-0.9-1
+monitor-GITPATH                 := git://git.verivue.com/planetlab/monitor.git@Monitor-3.0-29
 
 # locating the right test directory - see make tests_gitpath
-tests-GITPATH                  := git://git.onelab.eu/tests.git@tests-4.3-6
+tests-GITPATH                  := git://git.verivue.com/tests.git@verivue

diff --git a/coblitz.mk b/coblitz.mk
index 430eadf..3afe5ba 100644 (file)
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -117,14 +117,6 @@ nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
 
-#
-# ipod
-#
-ipod-MODULES := PingOfDeath
-ipod-SPEC := ipod.spec
-ALL += ipod
-IN_BOOTSTRAPFS += ipod
-
 #
 # NodeManager
 #
@@ -133,14 +125,6 @@ nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
 IN_BOOTSTRAPFS += nodemanager
 
-#
-# pl_sshd
-#
-sshd-MODULES := pl_sshd
-sshd-SPEC := pl_sshd.spec
-ALL += sshd
-IN_BOOTSTRAPFS += sshd
-
 #
 # codemux: Port 80 demux
 #
@@ -217,8 +201,10 @@ endif
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
+vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
@@ -256,14 +242,6 @@ plewww-SPEC := plewww.spec
 #ALL += plewww
 #IN_MYPLC += plewww
 
-#
-# www-register-wizard
-#
-www-register-wizard-MODULES := www-register-wizard
-www-register-wizard-SPEC := www-register-wizard.spec
-ALL += www-register-wizard
-IN_MYPLC += www-register-wizard
-
 #
 # pcucontrol
 #
@@ -271,28 +249,15 @@ pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
 
+
+## monitor
 #
-# monitor
-#
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-#ALL += plcrt
-
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-#ALL += zabbix
 
 #
 # pyopenssl
@@ -303,13 +268,6 @@ pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
 
 
-#
-# sfa - Slice Facility Architecture
-#
-# sfa-MODULES := sfa
-# sfa-SPEC := sfa.spec
-# ALL += sfa
-
 #
 # nodeconfig
 #
@@ -408,7 +366,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := myplc plcapi nodemanager Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
 

diff --git a/module-tools.py b/module-tools.py
index 8146561..e7c17c1 100755 (executable)
--- a/module-tools.py
+++ b/module-tools.py
@@ -21,7 +21,8 @@ RENAMED_SVN_MODULES = {
     "MyPLC": "myplc",
     "CoDemux": "codemux",
     "NodeManager": "nodemanager",
-    "NodeUpdate": "nodeupdate"
+    "NodeUpdate": "nodeupdate",
+    "Monitor": "monitor"
     }
 
 def svn_to_git_name(module):