other distros move to nodemanager that has a single specfile for all packages

diff --git a/mlab-tags.mk b/mlab-tags.mk
index a0294b6..12dac91 100644 (file)
--- a/mlab-tags.mk
+++ b/mlab-tags.mk
@@ -19,7 +19,7 @@ util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vs
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-11
 plnode-utils-GITPATH           := git://git.planet-lab.org/plnode-utils.git@plnode-utils-0.2-2
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-5.2-13
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@master
 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk

diff --git a/mlab.mk b/mlab.mk
index 2ffcd0b..6f2bac7 100644 (file)
--- a/mlab.mk
+++ b/mlab.mk
@@ -149,24 +149,12 @@ ipod-SPEC := ipod.spec
 ALL += ipod
 IN_NODEIMAGE += ipod
 
-#
-# NodeManager
-#
-#nodemanager-MODULES := nodemanager
-#nodemanager-SPEC := NodeManager.spec
-#ALL += nodemanager
-#IN_NODEIMAGE += nodemanager
-
 # nodemanager
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-nodemanager-vs-MODULES := nodemanager
-nodemanager-vs-SPEC := nodemanager-vs.spec
-ALL += nodemanager-vs
-IN_NODEIMAGE += nodemanager-vs
-
+#
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # plnode-utils

diff --git a/nornet-tags.mk b/nornet-tags.mk
index 68f0867..cb3aa06 100644 (file)
--- a/nornet-tags.mk
+++ b/nornet-tags.mk
@@ -39,7 +39,7 @@ planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@
 nodeupdate-GITPATH              := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-11
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 plnode-utils-GITPATH            := git://git.planet-lab.org/plnode-utils.git@plnode-utils-0.2-2
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-5.2-13
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@master
 #
 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-15

diff --git a/nornet.mk b/nornet.mk
index b2e5f37..084721f 100644 (file)
--- a/nornet.mk
+++ b/nornet.mk
@@ -215,18 +215,12 @@ plnode-utils-SPEC := plnode-utils-lxc.spec
 ALL += plnode-utils
 IN_NODEIMAGE += plnode-utils
 
-#
 # nodemanager
 #
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-lxc-MODULES := nodemanager
-nodemanager-lxc-SPEC := nodemanager-lxc.spec
-ALL += nodemanager-lxc
-IN_NODEIMAGE += nodemanager-lxc
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 935c355..34b00ea 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -17,7 +17,7 @@ util-vserver-pl-GITPATH               := git://git.planet-lab.org/util-vserver-pl.git@util-vs
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-11
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 plnode-utils-GITPATH           := git://git.onelab.eu/plnode-utils@plnode-utils-0.2-1
-nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@nodemanager-5.2-13
+nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@master
 # Trellis-specific NodeManager plugins
 nodemanager-topo-GITPATH       := git://git.planet-lab.org/NodeManager-topo@master
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk

diff --git a/planetlab.mk b/planetlab.mk
index a59cc83..7238dbb 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -157,18 +157,12 @@ plnode-utils-SPEC := plnode-utils-vs.spec
 ALL += plnode-utils
 IN_NODEIMAGE += plnode-utils
 
-#
 # nodemanager
 #
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-vs-MODULES := nodemanager
-nodemanager-vs-SPEC := nodemanager-vs.spec
-ALL += nodemanager-vs
-IN_NODEIMAGE += nodemanager-vs
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd