X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=7a09e92dbda193a950633053ad00ea4916558161;hb=d4a57e98cff29cddde7108b475f6b046e9fea20a;hp=810aedd2392b766c596fe0e4b7a5662c7f5c46d9;hpb=ca0f234e2dad50a502fa579d5e47f153ed3daf93;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 810aedd2..7a09e92d 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -150,12 +150,25 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+#
+# 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-vs-MODULES := nodemanager
+nodemanager-vs-SPEC := nodemanager-vs.spec
+ALL += nodemanager-vs
+IN_NODEIMAGE += nodemanager-vs
 
 #
 # pl_sshd
@@ -199,7 +212,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
@@ -232,10 +245,10 @@ openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
 openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
 
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
-IN_NODEIMAGE += openvswitch
-ALL += openvswitch
-endif
+#ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+#IN_NODEIMAGE += openvswitch
+#ALL += openvswitch
+#endif
 
 #
 # vsys
@@ -262,7 +275,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