Setting tag lxc-userspace-1.0-3

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index e17ab85..7a09e92 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -31,16 +31,16 @@ endif
 # so the source rpm is created by running make srpm in the codebase
 #
 
-#kernel-MODULES := linux-2.6
-#kernel-SPEC := kernel-2.6.spec
-#kernel-BUILD-FROM-SRPM := yes
-#ifeq "$(HOSTARCH)" "i386"
-#kernel-RPMFLAGS:= --target i686
-#else
-#kernel-RPMFLAGS:= --target $(HOSTARCH)
-#endif
-#kernel-SPECVARS += kernelconfig=planetlab
-#KERNELS += kernel
+kernel-MODULES := linux-2.6
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
+else
+kernel-RPMFLAGS:= --target $(HOSTARCH)
+endif
+kernel-SPECVARS += kernelconfig=planetlab
+KERNELS += kernel
 
 kernels: $(KERNELS)
 kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
@@ -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
@@ -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