X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mlab.mk;h=b95f38be1799fc158246453b5f040588ed2de41b;hb=3b718eb88f7c2ededf70cff1d9f002e43649888e;hp=ae3f623673614ae1055b3558618a6aa2f23c70a2;hpb=dd88fed790f12c1ca09f356b25bcc7837f8d5333;p=build.git

diff --git a/mlab.mk b/mlab.mk
index ae3f6236..b95f38be 100644
--- a/mlab.mk
+++ b/mlab.mk
@@ -85,10 +85,10 @@ IN_NODEIMAGE += iptables
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 iproute-BUILD-FROM-SRPM := yes	
-ALL += iproute
-IN_NODEIMAGE += iproute
-IN_SLICEIMAGE += iproute
-IN_BOOTCD += iproute
+#ALL += iproute
+#IN_NODEIMAGE += iproute
+#IN_SLICEIMAGE += iproute
+#IN_BOOTCD += iproute
 
 #
 # util-vserver
@@ -152,10 +152,29 @@ IN_NODEIMAGE += ipod
 #
 # NodeManager
 #
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += 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
+
+
+#
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
 
 #
 # pl_sshd
@@ -199,7 +218,7 @@ ALL += pf2slice
 #
 # PlanetLab Mom: Cleans up your mess
 #
-mom-MODULES := Mom
+mom-MODULES := mom
 mom-SPEC := pl_mom.spec
 ALL += mom
 IN_NODEIMAGE += mom
@@ -262,7 +281,7 @@ ALL += vsyssh
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
@@ -270,7 +289,7 @@ ALL += vsys-scripts
 # plcapi
 #
 plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi