From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 26 Jun 2012 07:39:13 +0000 (+0200)
Subject: nodemanager split packaging
X-Git-Tag: 5.0-rc28~48
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=056de3d4a225cebc39ebf2b57dbe9b229f8bc1b7;hp=bc2ea6553f46fcba82fdb096b53b42a41e85360e;p=build.git

nodemanager split packaging
---

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index 74aa8632..585c8b4d 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -119,7 +119,7 @@ package: wireless-tools
 #package: util-vserver-legacy
 #package: util-vserver-pl
 #package: util-python
-package: NodeManager
+package: nodemanager-lxc
 package: NodeUpdate
 package: codemux
 package: pl_sshd
diff --git a/config.planetlab/nodeimage.pkgs b/config.planetlab/nodeimage.pkgs
index 91582a23..bc33eabe 100644
--- a/config.planetlab/nodeimage.pkgs
+++ b/config.planetlab/nodeimage.pkgs
@@ -110,9 +110,6 @@ package: util-vserver-sysv
 package: util-vserver-legacy
 package: util-vserver-pl
 #package: util-python
-# temporary, so we can build planetlab and onelab
-package: NodeManager
-# temporary
 package: nodemanager-vs
 package: NodeUpdate
 package: codemux
diff --git a/lxc.mk b/lxc.mk
index 4540a2e3..f54ae753 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -56,12 +56,17 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# nodemanager
 #
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += 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
 
 #
 # pl_sshd
diff --git a/onelab.mk b/onelab.mk
index 9a79651d..627be2c5 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -180,7 +180,7 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# nodemanager
 #
 nodemanager-lib-MODULES := nodemanager
 nodemanager-lib-SPEC := nodemanager-lib.spec
diff --git a/planetlab.mk b/planetlab.mk
index 3034593f..4cdd41d3 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -150,7 +150,7 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# nodemanager
 #
 nodemanager-lib-MODULES := nodemanager
 nodemanager-lib-SPEC := nodemanager-lib.spec