From cff89dc18ddfba7f21d30c3f25ad29e232559a55 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat <thierry.parmentelat@inria.fr> Date: Thu, 15 May 2014 12:55:27 +0200 Subject: [PATCH] other distros move to nodemanager that has a single specfile for all packages --- mlab-tags.mk | 2 +- mlab.mk | 22 +++++----------------- nornet-tags.mk | 2 +- nornet.mk | 14 ++++---------- planetlab-k32-tags.mk | 2 +- planetlab.mk | 14 ++++---------- 6 files changed, 16 insertions(+), 40 deletions(-) diff --git a/mlab-tags.mk b/mlab-tags.mk index a0294b6c..12dac919 100644 --- 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 2ffcd0bd..6f2bac7e 100644 --- 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 68f08673..cb3aa062 100644 --- 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 b2e5f371..084721f0 100644 --- 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 935c3553..34b00eaf 100644 --- 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 a59cc836..7238dbba 100644 --- 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 -- 2.47.0