X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=b8bad61ce1d2505d66ce1f9aeea1eb9a70896265;hb=61908f1c343871575276cc196ce9cab0b2ffedde;hp=329a70ed63dadec2b0d9c4ac5c11adaff9823b4e;hpb=a71760f9be8a3361ebf71761cd4f47c20f81d9fd;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 329a70ed..b8bad61c 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -222,10 +222,10 @@ ALL += vsys-scripts
 #
 # PLCAPI
 #
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
+plcapi-MODULES := plcapi
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
+IN_MYPLC += plcapi
 
 #
 # drupal
@@ -239,7 +239,7 @@ IN_MYPLC += drupal
 #
 # use the plewww module instead
 #
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
 plewww-SPEC := plewww.spec
 ALL += plewww
 IN_MYPLC += plewww
@@ -291,6 +291,23 @@ pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
 
 
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
+
+#
+# ejabberd
+#
+ejabberd-MODULES := ejabberd
+ejabberd-SPEC := ejabberd.spec
+ejabberd-BUILD-FROM-SRPM := yes
+ALL += ejabberd
+
+
 #
 # sfa - Slice Facility Architecture
 #
@@ -303,7 +320,7 @@ ALL += sfa
 #
 # xxx needed when upgrading to 5.0
 #nodeconfig-MODULES := nodeconfig
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig
@@ -334,6 +351,23 @@ IN_BOOTSTRAPFS += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
+
+#
+# OMF resource controller
+#
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_VSERVER += omf-resctl
+
+#
+# OMF exp controller
+#
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
+
+
 #
 # bootcd
 #
@@ -393,9 +427,7 @@ IN_MYPLC += noderepo
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-# xxx needed when upgrading to 5.0
-#myplc-MODULES := MyPLC
-myplc-MODULES := MyPLC build 
+myplc-MODULES := MyPLC
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
@@ -403,7 +435,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
+myplc-docs-MODULES := MyPLC plcapi NodeManager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs